@theia/filesystem 1.77.0-next.95 → 1.77.0

package/src/browser/file-service-activation.spec.ts

@@ -22,8 +22,8 @@ FrontendApplicationConfigProvider.set({});
 
 import { Disposable, URI } from '@theia/core';
 import { expect } from 'chai';
-import { FileSystemProvider, FileSystemProviderCapabilities, WatchOptions } from '../common/files';
-import { FileService } from './file-service';
+import { FileSystemProvider, FileSystemProviderCapabilities, WatchOptions } from '../common/files.js';
+import { FileService } from './file-service.js';
 
 disableJSDOM();
 

package/src/browser/file-service-copy.spec.ts

@@ -23,8 +23,8 @@ FrontendApplicationConfigProvider.set({});
 import { Disposable, URI } from '@theia/core';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
-import { FileSystemProvider, FileSystemProviderCapabilities } from '../common/files';
-import { FileService } from './file-service';
+import { FileSystemProvider, FileSystemProviderCapabilities } from '../common/files.js';
+import { FileService } from './file-service.js';
 
 disableJSDOM();
 

package/src/browser/file-service-watcher.spec.ts

@@ -23,8 +23,8 @@ FrontendApplicationConfigProvider.set({});
 import { Disposable, Emitter, URI } from '@theia/core';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
-import { FileChange, FileChangeType, FileSystemProvider, FileSystemProviderCapabilities, WatchOptions } from '../common/files';
-import { FileService } from './file-service';
+import { FileChange, FileChangeType, FileSystemProvider, FileSystemProviderCapabilities, WatchOptions } from '../common/files.js';
+import { FileService } from './file-service.js';
 
 disableJSDOM();
 

package/src/browser/file-service.ts

@@ -52,22 +52,22 @@ import {
     ResolveFileResult, ResolveFileResultWithMetadata,
     MoveFileOptions, CopyFileOptions, BaseStatWithMetadata, FileDeleteOptions, FileOperationOptions, hasAccessCapability, hasUpdateCapability,
     hasFileReadStreamCapability, FileSystemProviderWithFileReadStreamCapability, ReadOnlyMessageFileSystemProvider
-} from '../common/files';
+} from '../common/files.js';
 import { BinaryBuffer, BinaryBufferReadable, BinaryBufferReadableStream, BinaryBufferReadableBufferedStream, BinaryBufferWriteableStream } from '@theia/core/lib/common/buffer';
 import { ReadableStream, isReadableStream, isReadableBufferedStream, transform, consumeStream, peekStream, peekReadable, Readable } from '@theia/core/lib/common/stream';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { FileSystemPreferences } from '../common/filesystem-preferences';
+import { FileSystemPreferences } from '../common/filesystem-preferences.js';
 import { ProgressService } from '@theia/core/lib/common/progress-service';
-import { DelegatingFileSystemProvider } from '../common/delegating-file-system-provider';
+import { DelegatingFileSystemProvider } from '../common/delegating-file-system-provider.js';
 import type { TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
 import { EncodingRegistry } from '@theia/core/lib/browser/encoding-registry';
 import { UTF8, UTF8_with_bom } from '@theia/core/lib/common/encodings';
 import { EncodingService, ResourceEncoding, DecodeStreamResult } from '@theia/core/lib/common/encoding-service';
 import { Minimatch } from 'minimatch';
 import { Mutable } from '@theia/core/lib/common/types';
-import { readFileIntoStream } from '../common/io';
-import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler';
-import { FileSystemUtils } from '../common/filesystem-utils';
+import { readFileIntoStream } from '../common/io.js';
+import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler.js';
+import { FileSystemUtils } from '../common/filesystem-utils.js';
 import { nls, ILogger } from '@theia/core';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
 

package/src/browser/file-tree/file-tree-container.ts

@@ -16,9 +16,9 @@
 
 import { interfaces, Container } from '@theia/core/shared/inversify';
 import { CompressedExpansionService, CompressionToggle, createTreeContainer, TreeCompressionService, TreeContainerProps } from '@theia/core/lib/browser';
-import { FileTree } from './file-tree';
-import { FileTreeModel } from './file-tree-model';
-import { FileTreeWidget } from './file-tree-widget';
+import { FileTree } from './file-tree.js';
+import { FileTreeModel } from './file-tree-model.js';
+import { FileTreeWidget } from './file-tree-widget.js';
 
 const fileTreeDefaults: Partial<TreeContainerProps> = {
     tree: FileTree,

package/src/browser/file-tree/file-tree-decorator-adapter.spec.ts

@@ -24,7 +24,7 @@ import { CancellationToken, Emitter, Event } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
 import { Container } from '@theia/core/shared/inversify';
 import { expect } from 'chai';
-import { FileTreeDecoratorAdapter } from './file-tree-decorator-adapter';
+import { FileTreeDecoratorAdapter } from './file-tree-decorator-adapter.js';
 
 disableJSDOM();
 

package/src/browser/file-tree/file-tree-decorator-adapter.ts

@@ -21,7 +21,7 @@ import { Decoration, DecorationsService } from '@theia/core/lib/browser/decorati
 import { TreeNode, TreeDecoration, TreeDecorator, Tree, TopDownTreeIterator } from '@theia/core/lib/browser';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { FileStatNode } from './file-tree';
+import { FileStatNode } from './file-tree.js';
 
 @injectable()
 export class FileTreeDecoratorAdapter implements TreeDecorator {

package/src/browser/file-tree/file-tree-label-provider.ts

@@ -16,7 +16,7 @@
 
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { LabelProviderContribution, DidChangeLabelEvent, LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { FileStatNode } from './file-tree';
+import { FileStatNode } from './file-tree.js';
 import { TreeLabelProvider } from '@theia/core/lib/browser/tree/tree-label-provider';
 
 @injectable()

package/src/browser/file-tree/file-tree-model.ts

@@ -17,14 +17,14 @@
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { CompositeTreeNode, TreeNode, ConfirmDialog, CompressedTreeModel, Dialog } from '@theia/core/lib/browser';
-import { FileStatNode, DirNode, FileNode } from './file-tree';
-import { LocationService } from '../location';
+import { FileStatNode, DirNode, FileNode } from './file-tree.js';
+import { LocationService } from '../location/index.js';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { FileService } from '../file-service';
-import { FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, FileChange } from '../../common/files';
+import { FileService } from '../file-service.js';
+import { FileOperationError, FileOperationResult, FileChangesEvent, FileChangeType, FileChange } from '../../common/files.js';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { FileSystemUtils } from '../../common';
+import { FileSystemUtils } from '../../common/index.js';
 import { nls } from '@theia/core';
 
 @injectable()
@@ -133,12 +133,15 @@ export class FileTreeModel extends CompressedTreeModel implements LocationServic
         return nodes;
     }
 
-    async copy(source: URI, target: Readonly<FileStatNode>): Promise<URI> {
+    async copy(source: URI, target: Readonly<FileStatNode>): Promise<URI | undefined> {
         /** If the target is a file or if the target is a directory, but is the same as the source, use the parent of the target as a destination. */
         const parentNode = (target.fileStat.isFile || target.uri.isEqual(source)) ? target.parent : target;
         if (!FileStatNode.is(parentNode)) {
             throw new Error('Parent of file has to be a FileStatNode');
         }
+        if (source.isEqualOrParent(parentNode.uri)) {
+            return undefined;
+        }
         let targetUri = parentNode.uri.resolve(source.path.base);
         try {
             const parent = await this.fileService.resolve(parentNode.uri);
@@ -156,6 +159,9 @@ export class FileTreeModel extends CompressedTreeModel implements LocationServic
      */
     async move(source: TreeNode, target: TreeNode): Promise<URI | undefined> {
         if (DirNode.is(target) && FileStatNode.is(source)) {
+            if (source.uri.isEqualOrParent(target.uri)) {
+                return undefined;
+            }
             const name = source.fileStat.name;
             const targetUri = target.uri.resolve(name);
             if (source.uri.isEqual(targetUri)) { return; }

package/src/browser/file-tree/file-tree-widget.tsx

@@ -21,13 +21,13 @@ import URI from '@theia/core/lib/common/uri';
 import { UriSelection } from '@theia/core/lib/common/selection';
 import { isCancelled } from '@theia/core/lib/common/cancellation';
 import { ContextMenuRenderer, NodeProps, TreeProps, TreeNode, CompositeTreeNode, CompressedTreeWidget, CompressedNodeProps } from '@theia/core/lib/browser';
-import { DirNode, FileStatNode, FileStatNodeData } from './file-tree';
-import { FileTreeModel } from './file-tree-model';
+import { DirNode, FileStatNode, FileStatNodeData } from './file-tree.js';
+import { FileTreeModel } from './file-tree-model.js';
 import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
 import { ApplicationShell } from '@theia/core/lib/browser/shell';
-import { FileStat, FileType } from '../../common/files';
+import { FileStat, FileType } from '../../common/files.js';
 import { isOSX, ILogger } from '@theia/core';
-import { FileUploadService } from '../../common/upload/file-upload';
+import { FileUploadService } from '../../common/upload/file-upload.js';
 
 export const FILE_TREE_CLASS = 'theia-FileTree';
 export const FILE_STAT_NODE_CLASS = 'theia-FileStatNode';
@@ -98,7 +98,10 @@ export class FileTreeWidget extends CompressedTreeWidget {
     }
 
     protected getNodeTooltip(node: TreeNode): string | undefined {
-        const operativeNode = this.compressionService.getCompressionChain(node)?.tail() ?? node;
+        const operativeNode = this.compressionToggle.compress
+            ? this.compressionService.getCompressionChain(node)?.tail() ?? node
+            : node;
+
         const uri = UriSelection.getUri(operativeNode);
         return uri ? uri.path.fsPath() : undefined;
     }

package/src/browser/file-tree/file-tree.ts

@@ -18,11 +18,11 @@ import { injectable, inject } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { isObject, Mutable } from '@theia/core/lib/common';
 import { TreeNode, CompositeTreeNode, SelectableTreeNode, ExpandableTreeNode, TreeImpl } from '@theia/core/lib/browser';
-import { FileStat, Stat, FileType, FileOperationError, FileOperationResult } from '../../common/files';
+import { FileStat, Stat, FileType, FileOperationError, FileOperationResult } from '../../common/files.js';
 import { UriSelection } from '@theia/core/lib/common/selection';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { FileSelection } from '../file-selection';
-import { FileService } from '../file-service';
+import { FileSelection } from '../file-selection.js';
+import { FileService } from '../file-service.js';
 
 @injectable()
 export class FileTree extends TreeImpl {

package/src/browser/file-tree/index.ts

@@ -14,9 +14,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './file-tree';
-export * from './file-tree-model';
-export * from './file-tree-widget';
-export * from './file-tree-container';
-export * from './file-tree-decorator-adapter';
-export * from './file-tree-label-provider';
+export * from './file-tree.js';
+export * from './file-tree-model.js';
+export * from './file-tree-widget.js';
+export * from './file-tree-container.js';
+export * from './file-tree-decorator-adapter.js';
+export * from './file-tree-label-provider.js';

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

@@ -37,12 +37,12 @@ import URI from '@theia/core/lib/common/uri';
 import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
-import { FileChangeType, FileChangesEvent, FileOperation } from '../common/files';
-import { FileDialogService, SaveFileDialogProps } from './file-dialog';
-import { FileSelection } from './file-selection';
-import { FileService, UserFileOperationEvent } from './file-service';
-import { FileSystemPreferences } from '../common/filesystem-preferences';
-import { FileUploadService } from '../common/upload/file-upload';
+import { FileChangeType, FileChangesEvent, FileOperation } from '../common/files.js';
+import { FileDialogService, SaveFileDialogProps } from './file-dialog/index.js';
+import { FileSelection } from './file-selection.js';
+import { FileService, UserFileOperationEvent } from './file-service.js';
+import { FileSystemPreferences } from '../common/filesystem-preferences.js';
+import { FileUploadService } from '../common/upload/file-upload.js';
 
 export namespace FileSystemCommands {
 

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

@@ -19,22 +19,22 @@ import '../../src/browser/style/index.css';
 import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
 import { ResourceResolver, CommandContribution } from '@theia/core/lib/common';
 import { WebSocketConnectionProvider, FrontendApplicationContribution, LabelProviderContribution, BreadcrumbsContribution } from '@theia/core/lib/browser';
-import { FileResourceResolver } from './file-resource';
-import { bindFileSystemPreferences } from '../common/filesystem-preferences';
-import { FileSystemFrontendContribution } from './filesystem-frontend-contribution';
-import { FileTreeDecoratorAdapter, FileTreeLabelProvider } from './file-tree';
-import { FileService, FileServiceContribution } from './file-service';
-import { RemoteFileSystemProvider, RemoteFileSystemServer, remoteFileSystemPath, RemoteFileSystemProxyFactory } from '../common/remote-file-system-provider';
+import { FileResourceResolver } from './file-resource.js';
+import { bindFileSystemPreferences } from '../common/filesystem-preferences.js';
+import { FileSystemFrontendContribution } from './filesystem-frontend-contribution.js';
+import { FileTreeDecoratorAdapter, FileTreeLabelProvider } from './file-tree/index.js';
+import { FileService, FileServiceContribution } from './file-service.js';
+import { RemoteFileSystemProvider, RemoteFileSystemServer, remoteFileSystemPath, RemoteFileSystemProxyFactory } from '../common/remote-file-system-provider.js';
 import { bindRootContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { RemoteFileServiceContribution } from './remote-file-service-contribution';
-import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler';
-import { FilepathBreadcrumbsContribution } from './breadcrumbs/filepath-breadcrumbs-contribution';
-import { BreadcrumbsFileTreeWidget, createFileTreeBreadcrumbsWidget } from './breadcrumbs/filepath-breadcrumbs-container';
-import { FilesystemSaveableService } from './filesystem-saveable-service';
+import { RemoteFileServiceContribution } from './remote-file-service-contribution.js';
+import { FileSystemWatcherErrorHandler } from './filesystem-watcher-error-handler.js';
+import { FilepathBreadcrumbsContribution } from './breadcrumbs/filepath-breadcrumbs-contribution.js';
+import { BreadcrumbsFileTreeWidget, createFileTreeBreadcrumbsWidget } from './breadcrumbs/filepath-breadcrumbs-container.js';
+import { FilesystemSaveableService } from './filesystem-saveable-service.js';
 import { SaveableService } from '@theia/core/lib/browser/saveable-service';
-import { VSCodeFileServiceContribution, VSCodeFileSystemProvider } from './vscode-file-service-contribution';
-import { FileUploadService } from '../common/upload/file-upload';
-import { FileUploadServiceImpl } from './upload/file-upload-service-impl';
+import { VSCodeFileServiceContribution, VSCodeFileSystemProvider } from './vscode-file-service-contribution.js';
+import { FileUploadService } from '../common/upload/file-upload.js';
+import { FileUploadServiceImpl } from './upload/file-upload-service-impl.js';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bindFileSystemPreferences(bind);

package/src/browser/filesystem-saveable-service.ts

@@ -19,8 +19,8 @@ import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { Navigatable, Saveable, SaveableSource, SaveOptions, Widget, open, OpenerService, ConfirmDialog, CommonCommands, LabelProvider } from '@theia/core/lib/browser';
 import { SaveableService } from '@theia/core/lib/browser/saveable-service';
 import URI from '@theia/core/lib/common/uri';
-import { FileService } from './file-service';
-import { FileDialogService } from './file-dialog';
+import { FileService } from './file-service.js';
+import { FileDialogService } from './file-dialog/index.js';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 
 @injectable()

package/src/browser/index.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './location';
-export * from './file-tree';
-export * from './file-dialog';
-export * from './file-resource';
+export * from './location/index.js';
+export * from './file-tree/index.js';
+export * from './file-dialog/index.js';
+export * from './file-resource.js';

package/src/browser/location/index.ts

@@ -14,5 +14,5 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './location-service';
-export * from './location-renderer';
+export * from './location-service.js';
+export * from './location-renderer.js';

package/src/browser/location/location-renderer.spec.ts

@@ -20,9 +20,9 @@ let disableJSDOM = enableJSDOM();
 import URI from '@theia/core/lib/common/uri';
 import { expect } from 'chai';
 import * as React from '@theia/core/shared/react';
-import type { FileDialogModel } from '../file-dialog/file-dialog-model';
-import { LocationListRenderer } from './location-renderer';
-import type { LocationService } from './location-service';
+import type { FileDialogModel } from '../file-dialog/file-dialog-model.js';
+import { LocationListRenderer } from './location-renderer.js';
+import type { LocationService } from './location-service.js';
 
 disableJSDOM();
 

package/src/browser/location/location-renderer.tsx

@@ -15,12 +15,12 @@
 // *****************************************************************************
 
 import URI from '@theia/core/lib/common/uri';
-import { LocationService } from './location-service';
+import { LocationService } from './location-service.js';
 import * as React from '@theia/core/shared/react';
-import { FileService } from '../file-service';
+import { FileService } from '../file-service.js';
 import { DisposableCollection, Emitter, Path } from '@theia/core/lib/common';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { FileDialogModel } from '../file-dialog/file-dialog-model';
+import { FileDialogModel } from '../file-dialog/file-dialog-model.js';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { ReactRenderer } from '@theia/core/lib/browser/widgets/react-renderer';
 import { codicon } from '@theia/core/lib/browser';

package/src/browser/remote-file-service-contribution.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { FileServiceContribution, FileService } from './file-service';
-import { RemoteFileSystemProvider } from '../common/remote-file-system-provider';
+import { FileServiceContribution, FileService } from './file-service.js';
+import { RemoteFileSystemProvider } from '../common/remote-file-system-provider.js';
 
 @injectable()
 export class RemoteFileServiceContribution implements FileServiceContribution {

package/src/browser/upload/file-upload-service-impl.ts

@@ -23,15 +23,15 @@ import { Deferred } from '@theia/core/lib/common/promise-util';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { Progress } from '@theia/core/lib/common/message-service-protocol';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
-import throttle = require('@theia/core/shared/lodash.throttle');
-import { HTTP_FILE_UPLOAD_PATH } from '../../common/file-upload';
+import throttle from '@theia/core/shared/lodash.throttle';
+import { HTTP_FILE_UPLOAD_PATH } from '../../common/file-upload.js';
 import { Semaphore } from 'async-mutex';
-import { FileSystemPreferences } from '../../common/filesystem-preferences';
-import { FileService } from '../file-service';
+import { FileSystemPreferences } from '../../common/filesystem-preferences.js';
+import { FileService } from '../file-service.js';
 import { ConfirmDialog, Dialog } from '@theia/core/lib/browser';
 import { nls } from '@theia/core/lib/common/nls';
 import { Emitter, Event } from '@theia/core/lib/common/event';
-import type { CustomDataTransfer, FileUploadService } from '../../common/upload/file-upload';
+import type { CustomDataTransfer, FileUploadService } from '../../common/upload/file-upload.js';
 
 interface UploadFilesParams {
     source: FileUploadService.Source,

package/src/browser/vscode-file-service-contribution.ts

@@ -15,10 +15,10 @@
 // *****************************************************************************
 
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { FileServiceContribution, FileService } from './file-service';
+import { FileServiceContribution, FileService } from './file-service.js';
 import {
     FileChange, FileDeleteOptions, FileOverwriteOptions, FilePermission, FileSystemProvider, FileSystemProviderCapabilities, FileType, FileWriteOptions, Stat, WatchOptions
-} from '../common/files';
+} from '../common/files.js';
 import { Event, URI, Disposable, Emitter } from '@theia/core';
 import { JsonSchemaDataStore } from '@theia/core/lib/browser/json-schema-store';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';

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

@@ -15,13 +15,13 @@
 // *****************************************************************************
 
 import { ContainerModule } from '@theia/core/shared/inversify';
-import { FileSystemProvider } from '../common/files';
-import { OPFSFileSystemProvider } from './opfs-filesystem-provider';
-import { RemoteFileSystemProvider, RemoteFileSystemServer } from '../common/remote-file-system-provider';
-import { OPFSInitialization, DefaultOPFSInitialization } from './opfs-filesystem-initialization';
-import { BrowserOnlyFileSystemProviderServer } from './browser-only-filesystem-provider-server';
-import { FileUploadService } from '../common/upload/file-upload';
-import { FileUploadServiceImpl } from './upload/file-upload-service-impl';
+import { FileSystemProvider } from '../common/files.js';
+import { OPFSFileSystemProvider } from './opfs-filesystem-provider.js';
+import { RemoteFileSystemProvider, RemoteFileSystemServer } from '../common/remote-file-system-provider.js';
+import { OPFSInitialization, DefaultOPFSInitialization } from './opfs-filesystem-initialization.js';
+import { BrowserOnlyFileSystemProviderServer } from './browser-only-filesystem-provider-server.js';
+import { FileUploadService } from '../common/upload/file-upload.js';
+import { FileUploadServiceImpl } from './upload/file-upload-service-impl.js';
 
 export default new ContainerModule((bind, _unbind, isBound, rebind) => {
     bind(DefaultOPFSInitialization).toSelf();

package/src/browser-only/browser-only-filesystem-provider-server.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { injectable } from '@theia/core/shared/inversify';
-import { FileSystemProviderServer } from '../common/remote-file-system-provider';
+import { FileSystemProviderServer } from '../common/remote-file-system-provider.js';
 import { Event } from '@theia/core';
 
 /**

package/src/browser-only/download/file-download-command-contribution.ts

@@ -19,8 +19,8 @@ import URI from '@theia/core/lib/common/uri';
 import { SelectionService } from '@theia/core/lib/common/selection-service';
 import { CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
 import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
-import { FileDownloadService } from '../../common/download/file-download';
-import { FileDownloadCommands } from '../../browser/download/file-download-command-contribution';
+import { FileDownloadService } from '../../common/download/file-download.js';
+import { FileDownloadCommands } from '../../browser/download/file-download-command-contribution.js';
 
 @injectable()
 export class FileDownloadCommandContribution implements CommandContribution {

package/src/browser-only/download/file-download-frontend-module.ts

@@ -15,10 +15,10 @@
 // *****************************************************************************
 
 import { ContainerModule } from '@theia/core/shared/inversify';
-import { FileDownloadService } from '../../common/download/file-download';
-import { FileDownloadServiceImpl } from './file-download-service';
+import { FileDownloadService } from '../../common/download/file-download.js';
+import { FileDownloadServiceImpl } from './file-download-service.js';
 import { CommandContribution } from '@theia/core/lib/common';
-import { FileDownloadCommandContribution } from './file-download-command-contribution';
+import { FileDownloadCommandContribution } from './file-download-command-contribution.js';
 
 export default new ContainerModule(bind => {
     bind(FileDownloadService).to(FileDownloadServiceImpl).inSingletonScope();

package/src/browser-only/download/file-download-service.ts

@@ -18,12 +18,12 @@ import { inject, injectable, named } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { FileSystemPreferences } from '../../common/filesystem-preferences';
+import { FileSystemPreferences } from '../../common/filesystem-preferences.js';
 import { nls } from '@theia/core';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { binaryStreamToWebStream } from '@theia/core/lib/common/stream';
-import { FileService } from '../../browser/file-service';
-import type { FileDownloadService } from '../../common/download/file-download';
+import { FileService } from '../../browser/file-service.js';
+import type { FileDownloadService } from '../../common/download/file-download.js';
 import * as tarStream from 'tar-stream';
 import { minimatch } from 'minimatch';
 

package/src/browser-only/file-search.ts

@@ -89,7 +89,8 @@ export function matchesPattern(text: string, patterns: string[], opts?: Minimatc
  * @returns An object with add and ignores methods
  */
 export function createIgnoreMatcher(): { add: (patterns: string | string[]) => void; ignores: (path: string) => boolean } {
-    const ig = ignore();
+    // `ignore` is a CommonJS module that also provides itself as `default` export.
+    const ig = ignore.default();
 
     return {
         add: (patterns: string | string[]) => ig.add(patterns),

package/src/browser-only/opfs-filesystem-initialization.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import type { OPFSFileSystemProvider } from './opfs-filesystem-provider';
+import type { OPFSFileSystemProvider } from './opfs-filesystem-provider.js';
 import { injectable } from '@theia/core/shared/inversify';
 
 export const OPFSInitialization = Symbol('OPFSInitialization');

package/src/browser-only/opfs-filesystem-provider.ts

@@ -26,16 +26,16 @@ import {
     FileType, FileWriteOptions, Stat, WatchOptions, createFileSystemProviderError,
     FileOpenOptions, FileUpdateOptions, FileUpdateResult,
     type FileReadStreamOptions
-} from '../common/files';
+} from '../common/files.js';
 import { Emitter, Event, URI, Disposable, DisposableCollection, type CancellationToken } from '@theia/core';
 import { EncodingService } from '@theia/core/lib/common/encoding-service';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { OPFSFileSystem, WatchEventType, type FileStat, type OPFSError, type WatchEvent } from 'opfs-worker';
-import { OPFSInitialization } from './opfs-filesystem-initialization';
+import { OPFSInitialization } from './opfs-filesystem-initialization.js';
 import { ReadableStreamEvents, newWriteableStream } from '@theia/core/lib/common/stream';
-import { readFileIntoStream } from '../common/io';
+import { readFileIntoStream } from '../common/io.js';
 import { Path } from '@theia/core/lib/common/path';
 
 @injectable()

package/src/browser-only/upload/file-upload-service-impl.ts

@@ -20,17 +20,17 @@ import { CancellationTokenSource, CancellationToken, checkCancelled, isCancelled
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { Progress } from '@theia/core/lib/common/message-service-protocol';
-import throttle = require('@theia/core/shared/lodash.throttle');
+import throttle from '@theia/core/shared/lodash.throttle';
 import { Semaphore } from 'async-mutex';
-import { FileService } from '../../browser/file-service';
+import { FileService } from '../../browser/file-service.js';
 import { ConfirmDialog, Dialog } from '@theia/core/lib/browser';
 import { nls } from '@theia/core/lib/common/nls';
 import { Emitter, Event } from '@theia/core/lib/common/event';
-import { FileSystemPreferences } from '../../common/filesystem-preferences';
+import { FileSystemPreferences } from '../../common/filesystem-preferences.js';
 import { fileToStream } from '@theia/core/lib/common/stream';
 import { minimatch } from 'minimatch';
 
-import type { FileUploadService } from '../../common/upload/file-upload';
+import type { FileUploadService } from '../../common/upload/file-upload.js';
 
 interface UploadState {
     uploaded?: boolean;

package/src/common/delegating-file-system-provider.ts

@@ -22,7 +22,7 @@ import {
     hasReadWriteCapability, hasFileFolderCopyCapability, hasOpenReadWriteCloseCapability, hasAccessCapability, FileUpdateOptions, hasUpdateCapability, FileUpdateResult,
     FileReadStreamOptions,
     hasFileReadStreamCapability
-} from './files';
+} from './files.js';
 import type { TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
 import { ReadableStreamEvents } from '@theia/core/lib/common/stream';
 

package/src/common/files.spec.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { FileChangesEvent, FileChangeType } from './files';
+import { FileChangesEvent, FileChangeType } from './files.js';
 import { expect } from 'chai';
 import URI from '@theia/core/lib/common/uri';
 

package/src/common/filesystem-utils.spec.ts

@@ -14,9 +14,9 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { FileStat } from './files';
+import { FileStat } from './files.js';
 import { expect } from 'chai';
-import { FileSystemUtils } from './filesystem-utils';
+import { FileSystemUtils } from './filesystem-utils.js';
 
 describe('generateUniqueResourceURI', () => {
     describe('Target is file', () => {

package/src/common/filesystem-utils.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { FileStat } from '../common/files';
+import { FileStat } from '../common/files.js';
 import URI from '@theia/core/lib/common/uri';
 
 export namespace FileSystemUtils {

package/src/common/filesystem-watcher-protocol.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { RpcServer } from '@theia/core';
-import { FileChangeType } from './files';
+import { FileChangeType } from './files.js';
 export { FileChangeType };
 
 export const FileSystemWatcherService = Symbol('FileSystemWatcherServer2');

package/src/common/index.ts

@@ -14,6 +14,6 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './filesystem';
-export * from './filesystem-utils';
-export * from './filesystem-preferences';
+export * from './filesystem.js';
+export * from './filesystem-utils.js';
+export * from './filesystem-preferences.js';