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

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');
@@ -89,6 +89,10 @@ export interface FileSystemWatcherClient {
 
 export interface WatchOptions {
     ignored: string[];
+    /**
+     * Watch the whole subtree under the given path. Defaults to `true`.
+     */
+    recursive?: boolean;
 }
 export interface FileChange {
     uri: string;

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

package/src/common/io.ts

@@ -22,9 +22,9 @@
 /* eslint-disable max-len */
 
 import URI from '@theia/core/lib/common/uri';
-import { BinaryBuffer } from '@theia/core/lib/common//buffer';
+import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { CancellationToken, cancelled as canceled } from '@theia/core/lib/common/cancellation';
-import { FileSystemProviderWithOpenReadWriteCloseCapability, FileReadStreamOptions, ensureFileSystemProviderError, createFileSystemProviderError, FileSystemProviderErrorCode } from './files';
+import { FileSystemProviderWithOpenReadWriteCloseCapability, FileReadStreamOptions, ensureFileSystemProviderError, createFileSystemProviderError, FileSystemProviderErrorCode } from './files.js';
 import { WriteableStream, ErrorTransformer, DataTransformer } from '@theia/core/lib/common/stream';
 
 export interface CreateReadStreamOptions extends FileReadStreamOptions {

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

@@ -25,7 +25,7 @@ import {
     hasOpenReadWriteCloseCapability, hasFileFolderCopyCapability, hasReadWriteCapability, hasAccessCapability,
     FileSystemProviderError, FileSystemProviderErrorCode, FileUpdateOptions, hasUpdateCapability, FileUpdateResult, FileReadStreamOptions, hasFileReadStreamCapability,
     ReadOnlyMessageFileSystemProvider
-} from './files';
+} from './files.js';
 import { RpcServer, RpcProxy, RpcProxyFactory } from '@theia/core/lib/common/messaging/proxy-factory';
 import { ApplicationError } from '@theia/core/lib/common/application-error';
 import { Deferred } from '@theia/core/lib/common/promise-util';

package/src/electron-browser/file-dialog/electron-file-dialog-module.ts

@@ -15,8 +15,8 @@
 // *****************************************************************************
 
 import { ContainerModule } from '@theia/core/shared/inversify';
-import { ElectronFileDialogService } from './electron-file-dialog-service';
-import { FileDialogService } from '../../browser';
+import { ElectronFileDialogService } from './electron-file-dialog-service.js';
+import { FileDialogService } from '../../browser/index.js';
 
 export default new ContainerModule((bind, _unbind, _isBound, rebind) => {
     bind(ElectronFileDialogService).toSelf().inSingletonScope();

package/src/electron-browser/file-dialog/electron-file-dialog-service.spec.ts

@@ -0,0 +1,57 @@
+// *****************************************************************************
+// Copyright (C) 2026 Vinay Kaushal and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
+let disableJSDOM = enableJSDOM();
+
+import { expect } from 'chai';
+import { FileUri } from '@theia/core/lib/common/file-uri';
+import URI from '@theia/core/lib/common/uri';
+import { OpenFileDialogProps } from '../../browser/file-dialog/index.js';
+import { OpenDialogOptions } from '../../electron-common/electron-api.js';
+import { ElectronFileDialogService } from './electron-file-dialog-service.js';
+
+disableJSDOM();
+
+class TestElectronFileDialogService extends ElectronFileDialogService {
+    override toOpenDialogOptions(uri: URI, props: OpenFileDialogProps): OpenDialogOptions {
+        return super.toOpenDialogOptions(uri, props);
+    }
+}
+
+describe('ElectronFileDialogService', () => {
+
+    before(() => disableJSDOM = enableJSDOM());
+    after(() => disableJSDOM());
+
+    const uri = FileUri.create('/home/user');
+    const filters = { 'Theia Workspace': ['theia-workspace'] };
+
+    it('adds an All Files filter to the given filters', () => {
+        const options = new TestElectronFileDialogService().toOpenDialogOptions(uri, { title: 'Open', canSelectFiles: true, filters });
+        expect(options.filters).to.deep.equal([
+            { name: 'Theia Workspace', extensions: ['theia-workspace'] },
+            { name: 'All Files', extensions: ['*'] }
+        ]);
+    });
+
+    it('omits the All Files filter if it is disabled', () => {
+        const options = new TestElectronFileDialogService().toOpenDialogOptions(uri, { title: 'Open', canSelectFiles: true, filters, disableAllFilesFilter: true });
+        expect(options.filters).to.deep.equal([
+            { name: 'Theia Workspace', extensions: ['theia-workspace'] }
+        ]);
+    });
+});

package/src/electron-browser/file-dialog/electron-file-dialog-service.ts

@@ -18,9 +18,9 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { MaybeArray } from '@theia/core/lib/common/types';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { FileStat } from '../../common/files';
-import { FileAccess } from '../../common/filesystem';
-import { DefaultFileDialogService, OpenFileDialogProps, SaveFileDialogProps } from '../../browser/file-dialog';
+import { FileStat } from '../../common/files.js';
+import { FileAccess } from '../../common/filesystem.js';
+import { DefaultFileDialogService, OpenFileDialogProps, SaveFileDialogProps } from '../../browser/file-dialog/index.js';
 //
 // We are OK to use this here because the electron backend and frontend are on the same host.
 // If required, we can move this single service (and its module) to a dedicated Theia extension,
@@ -29,7 +29,7 @@ import { DefaultFileDialogService, OpenFileDialogProps, SaveFileDialogProps } fr
 //
 // eslint-disable-next-line @theia/runtime-import-check
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { OpenDialogOptions, SaveDialogOptions } from '../../electron-common/electron-api';
+import { OpenDialogOptions, SaveDialogOptions } from '../../electron-common/electron-api.js';
 
 import '@theia/core/lib/electron-common/electron-api';
 
@@ -136,7 +136,7 @@ export class ElectronFileDialogService extends DefaultFileDialogService {
                 result.filters.push({ name: label, extensions: extensions });
             }
 
-            if (props.canSelectFiles) {
+            if (props.canSelectFiles && !props.disableAllFilesFilter) {
                 if (filters.length > 0) {
                     result.filters.push({ name: 'All Files', extensions: ['*'] });
                 }

package/src/electron-browser/preload.ts

@@ -13,7 +13,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { CHANNEL_SHOW_OPEN, CHANNEL_SHOW_SAVE, OpenDialogOptions, SaveDialogOptions, TheiaFilesystemAPI } from '../electron-common/electron-api';
+import { CHANNEL_SHOW_OPEN, CHANNEL_SHOW_SAVE, OpenDialogOptions, SaveDialogOptions, TheiaFilesystemAPI } from '../electron-common/electron-api.js';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { ipcRenderer, contextBridge } from '@theia/core/electron-shared/electron';

package/src/electron-main/electron-api-main.ts

@@ -18,7 +18,7 @@ import { injectable } from '@theia/core/shared/inversify';
 
 import { ElectronMainApplication, ElectronMainApplicationContribution } from '@theia/core/lib/electron-main/electron-main-application';
 import { MaybePromise } from '@theia/core';
-import { CHANNEL_SHOW_OPEN, CHANNEL_SHOW_SAVE, OpenDialogOptions, SaveDialogOptions } from '../electron-common/electron-api';
+import { CHANNEL_SHOW_OPEN, CHANNEL_SHOW_SAVE, OpenDialogOptions, SaveDialogOptions } from '../electron-common/electron-api.js';
 import { ipcMain, OpenDialogOptions as ElectronOpenDialogOptions, SaveDialogOptions as ElectronSaveDialogOptions, BrowserWindow, dialog }
     from '@theia/core/electron-shared/electron';
 

package/src/electron-main/electron-main-module.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { ElectronMainApplicationContribution } from '@theia/core/lib/electron-main/electron-main-application';
-import { ElectronApi } from './electron-api-main';
+import { ElectronApi } from './electron-api-main.js';
 
 export default new ContainerModule(bind => {
     bind(ElectronApi).toSelf().inSingletonScope();

package/src/node/disk-file-system-provider.spec.ts

@@ -27,9 +27,9 @@ import * as os from 'os';
 import { join } from 'path';
 import * as temp from 'temp';
 import { generateUuid } from '@theia/core/lib/common/uuid';
-import { FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode } from '../common/files';
-import { DiskFileSystemProvider } from './disk-file-system-provider';
-import { bindFileSystemWatcherServer } from './filesystem-backend-module';
+import { FilePermission, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode } from '../common/files.js';
+import { DiskFileSystemProvider } from './disk-file-system-provider.js';
+import { bindFileSystemWatcherServer } from './filesystem-backend-module.js';
 
 const tracked = temp.track();
 
@@ -114,6 +114,35 @@ describe('disk-file-system-provider', () => {
             }
         });
 
+        it('handles errors during temporary cleanup', async () => {
+            const tempDirPath = tracked.mkdirSync();
+            const provider = fsProvider as unknown as {
+                rimrafMove(path: string): Promise<void>;
+                rimrafUnlink(path: string): Promise<void>;
+                logger: ILogger;
+            };
+            const originalRimrafUnlink = provider.rimrafUnlink;
+            const originalWarn = provider.logger.warn;
+            let resolveWarning!: () => void;
+            const warningHandled = new Promise<void>(resolve => {
+                resolveWarning = resolve;
+            });
+            provider.rimrafUnlink = async path => {
+                await fs.rm(path, { recursive: true, force: true });
+                throw new Error('Cleanup failed');
+            };
+            provider.logger.warn = async () => {
+                resolveWarning();
+            };
+            try {
+                await provider.rimrafMove(tempDirPath);
+                await warningHandled;
+            } finally {
+                provider.rimrafUnlink = originalRimrafUnlink;
+                provider.logger.warn = originalWarn;
+            }
+        });
+
         it('delete is able to delete file', async function (): Promise<void> {
             this.timeout(10000);
             // Place the temp dir under $HOME so the XDG trash dir (~/.local/share/Trash) is on the same

package/src/node/disk-file-system-provider.ts

@@ -56,17 +56,18 @@ import {
     FileChange,
     WatchOptions,
     FileUpdateOptions, FileUpdateResult, FileReadStreamOptions, FilePermission
-} from '../common/files';
-import { FileSystemWatcherServer } from '../common/filesystem-watcher-protocol';
-import trash = require('trash');
+} from '../common/files.js';
+import { FileSystemWatcherServer } from '../common/filesystem-watcher-protocol.js';
+import trash from 'trash';
 import { TextDocumentContentChangeEvent } from '@theia/core/shared/vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { EncodingService } from '@theia/core/lib/common/encoding-service';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { ReadableStreamEvents, newWriteableStream } from '@theia/core/lib/common/stream';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
-import { readFileIntoStream } from '../common/io';
-import { Mode } from 'stat-mode';
+import { readFileIntoStream } from '../common/io.js';
+// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
+import statMode from 'stat-mode';
 
 export namespace DiskFileSystemProvider {
     export interface StatAndLink {
@@ -156,7 +157,7 @@ export class DiskFileSystemProvider implements Disposable,
     async stat(resource: URI): Promise<Stat> {
         try {
             const { stat, symbolicLink } = await this.statLink(this.toFilePath(resource)); // cannot use fs.stat() here to support links properly
-            const mode = new Mode(stat);
+            const mode = new statMode.Mode(stat);
             return {
                 type: this.toType(stat, symbolicLink),
                 ctime: stat.birthtime.getTime(), // intentionally not using ctime here, we want the creation time
@@ -541,7 +542,9 @@ export class DiskFileSystemProvider implements Disposable,
             }
 
             // Delete but do not return as promise
-            this.rimrafUnlink(pathInTemp);
+            this.rimrafUnlink(pathInTemp).catch(error => {
+                this.logger.warn(`Failed to clean up temporary rimraf folder '${pathInTemp}':`, error);
+            });
         } catch (error) {
             if (error.code !== 'ENOENT') {
                 throw error;
@@ -833,7 +836,8 @@ export class DiskFileSystemProvider implements Disposable,
         };
         watcherService.watchFileChanges(resource.toString(), {
             // Convert from `files.WatchOptions` to internal `watcher-protocol.WatchOptions`:
-            ignored: opts.excludes
+            ignored: opts.excludes,
+            recursive: opts.recursive
         }).then(watcherId => {
             if (handle.disposed) {
                 watcherService.unwatchFileChanges(watcherId);

package/src/node/download/directory-archiver.spec.ts

@@ -20,7 +20,7 @@ import * as temp from 'temp';
 import { extract } from 'tar-fs';
 import { expect } from 'chai';
 import URI from '@theia/core/lib/common/uri';
-import { MockDirectoryArchiver } from './test/mock-directory-archiver';
+import { MockDirectoryArchiver } from './test/mock-directory-archiver.js';
 import { FileUri } from '@theia/core/lib/common/file-uri';
 
 const track = temp.track();

package/src/node/download/file-download-backend-module.ts

@@ -16,10 +16,10 @@
 
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
-import { FileDownloadEndpoint } from './file-download-endpoint';
-import { FileDownloadHandler, SingleFileDownloadHandler, MultiFileDownloadHandler, DownloadLinkHandler } from './file-download-handler';
-import { DirectoryArchiver } from './directory-archiver';
-import { FileDownloadCache } from './file-download-cache';
+import { FileDownloadEndpoint } from './file-download-endpoint.js';
+import { FileDownloadHandler, SingleFileDownloadHandler, MultiFileDownloadHandler, DownloadLinkHandler } from './file-download-handler.js';
+import { DirectoryArchiver } from './directory-archiver.js';
+import { FileDownloadCache } from './file-download-cache.js';
 
 export default new ContainerModule(bind => {
     bind(FileDownloadEndpoint).toSelf().inSingletonScope();

package/src/node/download/file-download-cache.ts

@@ -39,7 +39,7 @@ export class FileDownloadCache {
             downloadInfo.root = encodeURIComponent(downloadInfo.root);
         }
         // expires in 1 minute enough for parallel connections to be connected.
-        downloadInfo.expire = Date.now() + (this.expireTimeInMinutes * 600000);
+        downloadInfo.expire = Date.now() + (this.expireTimeInMinutes * 60 * 1000);
         this.downloads.set(id, downloadInfo);
     }
 

package/src/node/download/file-download-endpoint.ts

@@ -17,12 +17,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { json } from 'body-parser';
+// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
+import bodyParser from 'body-parser';
 import { Application, Router, RequestHandler } from '@theia/core/shared/express';
 import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
 import { HttpConnectionValidator } from '@theia/core/lib/node';
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { FileDownloadHandler } from './file-download-handler';
+import { FileDownloadHandler } from './file-download-handler.js';
 
 @injectable()
 export class FileDownloadEndpoint implements BackendApplicationContribution {
@@ -52,7 +53,7 @@ export class FileDownloadEndpoint implements BackendApplicationContribution {
         router.get('/', (request, response) => this.singleFileDownloadHandler.handle(request, response));
         router.put('/', (request, response) => this.multiFileDownloadHandler.handle(request, response));
         // Content-Type: application/json
-        app.use(json());
+        app.use(bodyParser.json());
         app.use(FileDownloadEndpoint.PATH, guard, router);
         app.get('/file', guard, (request, response) => {
             const uri = new URL(request.url, 'http://localhost').search.slice(1);

package/src/node/download/file-download-handler.ts

@@ -25,9 +25,9 @@ import URI from '@theia/core/lib/common/uri';
 import { isEmpty } from '@theia/core/lib/common/objects';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { DirectoryArchiver } from './directory-archiver';
-import { FileDownloadData } from '../../common/download/file-download';
-import { FileDownloadCache, DownloadStorageItem } from './file-download-cache';
+import { DirectoryArchiver } from './directory-archiver.js';
+import { FileDownloadData } from '../../common/download/file-download.js';
+import { FileDownloadCache, DownloadStorageItem } from './file-download-cache.js';
 
 interface PrepareDownloadOptions {
     filePath: string;
@@ -285,7 +285,6 @@ export class MultiFileDownloadHandler extends FileDownloadHandler {
             }
             const options: PrepareDownloadOptions = { filePath: '', downloadId, remove: true, root: outputRootPath };
             if (tarPaths.length === 1) {
-                // tslint:disable-next-line:whitespace
                 const [outputPath,] = tarPaths;
                 options.filePath = outputPath;
                 await this.prepareDownload(request, response, options);

package/src/node/download/test/mock-directory-archiver.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { DirectoryArchiver } from '../directory-archiver';
+import { DirectoryArchiver } from '../directory-archiver.js';
 import URI from '@theia/core/lib/common/uri';
 
 export class MockDirectoryArchiver extends DirectoryArchiver {

package/src/node/file-change-collection.spec.ts

@@ -16,8 +16,8 @@
 
 import * as assert from 'assert';
 import { FileUri } from '@theia/core/lib/common/file-uri';
-import { FileChangeCollection } from './file-change-collection';
-import { FileChangeType } from '../common/files';
+import { FileChangeCollection } from './file-change-collection.js';
+import { FileChangeType } from '../common/files.js';
 
 describe('FileChangeCollection', () => {
 

package/src/node/file-change-collection.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { FileChange, FileChangeType } from '../common/filesystem-watcher-protocol';
+import { FileChange, FileChangeType } from '../common/filesystem-watcher-protocol.js';
 
 /**
  * A file change collection guarantees that only one change is reported for each URI.