fix #7495: upgrade to latest vscode-uri to align with URI used by Monaco

Signed-off-by: Anton Kosyakov <[email protected]>
eclipse-theia · Apr 7, 2020 · 1453157 · 1453157
1 parent 5b88190
commit 1453157
Show file tree

Hide file tree

Showing 66 changed files with 77 additions and 85 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -42,7 +42,7 @@
     "reflect-metadata": "^0.1.10",
     "route-parser": "^0.0.5",
     "vscode-languageserver-types": "^3.15.0-next",
-    "vscode-uri": "^1.0.8",
+    "vscode-uri": "^2.1.1",
     "vscode-ws-jsonrpc": "^0.2.0",
     "ws": "^7.1.2",
     "yargs": "^11.1.0"
@@ -99,4 +99,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/core/src/browser/resource-context-key.ts b/packages/core/src/browser/resource-context-key.ts
@@ -16,7 +16,7 @@
 
 import { injectable, inject, postConstruct } from 'inversify';
 import URI from '../common/uri';
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import { ContextKeyService, ContextKey } from './context-key-service';
 
 @injectable()

diff --git a/packages/core/src/common/uri.ts b/packages/core/src/common/uri.ts
@@ -14,13 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { setUriThrowOnMissingScheme } from 'vscode-uri';
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import { Path } from './path';
 
-// TODO: disable it because of #4487
-setUriThrowOnMissingScheme(false);
-
 export default class URI {
 
     private readonly codeUri: Uri;

diff --git a/packages/core/src/node/file-uri.ts b/packages/core/src/node/file-uri.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import URI from '../common/uri';
 import { isWindows } from '../common/os';
 

diff --git a/packages/debug/src/browser/model/debug-source.ts b/packages/debug/src/browser/model/debug-source.ts
@@ -19,7 +19,7 @@ import { EditorManager, EditorOpenerOptions, EditorWidget } from '@theia/editor/
 import URI from '@theia/core/lib/common/uri';
 import { DebugProtocol } from 'vscode-debugprotocol/lib/debugProtocol';
 import { DebugSession } from '../debug-session';
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 
 export class DebugSourceData {
     readonly raw: DebugProtocol.Source;

diff --git a/packages/languages/package.json b/packages/languages/package.json
@@ -10,7 +10,7 @@
     "@theia/workspace": "^1.0.0",
     "@theia/monaco-editor-core": "^0.19.3",
     "@types/uuid": "^3.4.3",
-    "monaco-languageclient": "^0.12.0",
+    "monaco-languageclient": "^0.13.0",
     "uuid": "^3.2.1"
   },
   "publishConfig": {
@@ -51,4 +51,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}
diff --git a/packages/monaco/src/browser/monaco-workspace.ts b/packages/monaco/src/browser/monaco-workspace.ts
@@ -16,7 +16,7 @@
 
 /* eslint-disable no-null/no-null */
 
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import { injectable, inject, postConstruct } from 'inversify';
 import { ProtocolToMonacoConverter, MonacoToProtocolConverter, testGlob } from 'monaco-languageclient';
 import URI from '@theia/core/lib/common/uri';

diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts
@@ -47,7 +47,7 @@ import { DiffService } from '@theia/workspace/lib/browser/diff-service';
 import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { inject, injectable } from 'inversify';
 import { Position } from '@theia/plugin-ext/lib/common/plugin-api-rpc';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 
 export namespace VscodeCommands {
     export const OPEN: Command = {

diff --git a/packages/plugin-ext/src/common/rpc-protocol.ts b/packages/plugin-ext/src/common/rpc-protocol.ts
@@ -25,7 +25,7 @@
 import { Event } from '@theia/core/lib/common/event';
 import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
 import { Deferred } from '@theia/core/lib/common/promise-util';
-import VSCodeURI from 'vscode-uri';
+import { URI as VSCodeURI } from 'vscode-uri';
 import URI from '@theia/core/lib/common/uri';
 import { CancellationToken, CancellationTokenSource } from 'vscode-languageserver-protocol';
 import { Range, Position } from '../plugin/types-impl';

diff --git a/packages/plugin-ext/src/main/browser/callhierarchy/callhierarchy-type-converters.ts b/packages/plugin-ext/src/main/browser/callhierarchy/callhierarchy-type-converters.ts
@@ -18,7 +18,7 @@ import { Definition as CallHierarchyDefinition, Caller as CallHierarchyCaller }
 import * as model from '../../../common/plugin-api-rpc-model';
 import * as rpc from '../../../common/plugin-api-rpc';
 import * as callhierarchy from 'vscode-languageserver-types';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { UriComponents } from '../../../common/uri-components';
 import { Location } from 'vscode-languageserver-types';
 

diff --git a/packages/plugin-ext/src/main/browser/debug/debug-main.ts b/packages/plugin-ext/src/main/browser/debug/debug-main.ts
@@ -29,7 +29,7 @@ import { LabelProvider } from '@theia/core/lib/browser';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { BreakpointManager, BreakpointsChangeEvent } from '@theia/debug/lib/browser/breakpoint/breakpoint-manager';
 import { DebugSourceBreakpoint } from '@theia/debug/lib/browser/model/debug-source-breakpoint';
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import { DebugConsoleSession } from '@theia/debug/lib/browser/console/debug-console-session';
 import { SourceBreakpoint, FunctionBreakpoint } from '@theia/debug/lib/browser/breakpoint/breakpoint-marker';
 import { DebugConfiguration } from '@theia/debug/lib/common/debug-configuration';

diff --git a/packages/plugin-ext/src/main/browser/documents-main.ts b/packages/plugin-ext/src/main/browser/documents-main.ts
@@ -23,7 +23,7 @@ import { EditorModelService } from './text-editor-model-service';
 import { UntitledResourceResolver } from './editor/untitled-resource';
 import { EditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser';
 import URI from '@theia/core/lib/common/uri';
-import CodeURI from 'vscode-uri';
+import { URI as CodeURI } from 'vscode-uri';
 import { ApplicationShell, Saveable } from '@theia/core/lib/browser';
 import { TextDocumentShowOptions } from '../../common/plugin-api-rpc-model';
 import { Range } from 'vscode-languageserver-types';

diff --git a/packages/plugin-ext/src/main/browser/file-system-main.ts b/packages/plugin-ext/src/main/browser/file-system-main.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { interfaces, injectable } from 'inversify';
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import { Disposable, ResourceResolver, DisposableCollection } from '@theia/core';
 import { Resource, ResourceProvider } from '@theia/core/lib/common/resource';
 import URI from '@theia/core/lib/common/uri';

diff --git a/packages/plugin-ext/src/main/browser/menus/menus-contribution-handler.ts b/packages/plugin-ext/src/main/browser/menus/menus-contribution-handler.ts
@@ -16,7 +16,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import CodeUri from 'vscode-uri';
+import { URI as CodeUri } from 'vscode-uri';
 import { injectable, inject } from 'inversify';
 import { MenuPath, ILogger, CommandRegistry, Command, Mutable, MenuAction, SelectionService, CommandHandler, Disposable, DisposableCollection } from '@theia/core';
 import { EDITOR_CONTEXT_MENU, EditorWidget } from '@theia/editor/lib/browser';

diff --git a/packages/plugin-ext/src/main/browser/quick-open-main.ts b/packages/plugin-ext/src/main/browser/quick-open-main.ts
@@ -36,7 +36,7 @@ import {
 import { MonacoQuickOpenService } from '@theia/monaco/lib/browser/monaco-quick-open-service';
 import { QuickInputService, LabelProvider } from '@theia/core/lib/browser';
 import { PluginSharedStyle } from './plugin-shared-style';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { ThemeIcon, QuickInputButton } from '../../plugin/types-impl';
 import { QuickPickService, QuickPickItem, QuickPickValue } from '@theia/core/lib/common/quick-pick-service';
 import { QuickTitleBar } from '@theia/core/lib/browser/quick-open/quick-title-bar';

diff --git a/packages/plugin-ext/src/main/browser/text-editors-main.ts b/packages/plugin-ext/src/main/browser/text-editors-main.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import {
     TextEditorsMain,
     MAIN_RPC_CONTEXT,

diff --git a/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx b/packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { injectable, inject, postConstruct } from 'inversify';
 import { TreeViewsExt, TreeViewSelection } from '../../../common/plugin-api-rpc';
 import { Command } from '../../../common/plugin-api-rpc-model';

diff --git a/packages/plugin-ext/src/main/browser/webviews-main.ts b/packages/plugin-ext/src/main/browser/webviews-main.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import debounce = require('lodash.debounce');
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { interfaces } from 'inversify';
 import { WebviewsMain, MAIN_RPC_CONTEXT, WebviewsExt, WebviewPanelViewState } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';

diff --git a/packages/plugin-ext/src/main/browser/window-state-main.ts b/packages/plugin-ext/src/main/browser/window-state-main.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import CoreURI from '@theia/core/lib/common/uri';
 import { interfaces } from 'inversify';
 import { WindowStateExt, MAIN_RPC_CONTEXT, WindowMain } from '../../common/plugin-api-rpc';

diff --git a/packages/plugin-ext/src/main/browser/workspace-main.ts b/packages/plugin-ext/src/main/browser/workspace-main.ts
@@ -18,7 +18,7 @@ import * as theia from '@theia/plugin';
 import { interfaces, injectable } from 'inversify';
 import { WorkspaceExt, StorageExt, MAIN_RPC_CONTEXT, WorkspaceMain, WorkspaceFolderPickOptionsMain } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import { UriComponents } from '../../common/uri-components';
 import { QuickOpenModel, QuickOpenItem, QuickOpenMode } from '@theia/core/lib/browser/quick-open/quick-open-model';
 import { MonacoQuickOpenService } from '@theia/monaco/lib/browser/monaco-quick-open-service';

diff --git a/packages/plugin-ext/src/plugin/decorations.ts b/packages/plugin-ext/src/plugin/decorations.ts
@@ -24,7 +24,7 @@ import {
 } from '../common/plugin-api-rpc';
 import { Event } from '@theia/core/lib/common/event';
 import { RPCProtocol } from '../common/rpc-protocol';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { Disposable } from './types-impl';
 
 export class DecorationsExtImpl implements DecorationsExt {

diff --git a/packages/plugin-ext/src/plugin/dialogs.ts b/packages/plugin-ext/src/plugin/dialogs.ts
@@ -16,7 +16,7 @@
 import { PLUGIN_RPC_CONTEXT as Ext, OpenDialogOptionsMain, DialogsMain, SaveDialogOptionsMain, UploadDialogOptionsMain } from '../common/plugin-api-rpc';
 import { OpenDialogOptions, SaveDialogOptions, UploadDialogOptions } from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
-import Uri from 'vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 
 export class DialogsExtImpl {
     private proxy: DialogsMain;

diff --git a/packages/plugin-ext/src/plugin/document-data.ts b/packages/plugin-ext/src/plugin/document-data.ts
@@ -17,7 +17,7 @@
 import * as theia from '@theia/plugin';
 import { ModelChangedEvent, DocumentsMain } from '../common/plugin-api-rpc';
 import { Range as ARange } from '../common/plugin-api-rpc-model';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { ok } from '../common/assert';
 import { Range, Position, EndOfLine } from './types-impl';
 import { PrefixSumComputer } from './prefix-sum-computer';

diff --git a/packages/plugin-ext/src/plugin/documents.ts b/packages/plugin-ext/src/plugin/documents.ts
@@ -21,7 +21,7 @@
  * based on https://github.com/Microsoft/vscode/blob/bf9a27ec01f2ef82fc45f69e0c946c7d74a57d3e/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
  */
 import { DocumentsExt, ModelChangedEvent, PLUGIN_RPC_CONTEXT, DocumentsMain, SingleEditOperation } from '../common/plugin-api-rpc';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { UriComponents } from '../common/uri-components';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Emitter, Event } from '@theia/core/lib/common/event';

diff --git a/packages/plugin-ext/src/plugin/editors-and-documents.ts b/packages/plugin-ext/src/plugin/editors-and-documents.ts
@@ -22,7 +22,7 @@ import { DocumentDataExt } from './document-data';
 import { ok } from '../common/assert';
 import * as Converter from './type-converters';
 import { dispose } from '../common/disposable-util';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 
 export class EditorsAndDocumentsExtImpl implements EditorsAndDocumentsExt {
     private activeEditorId: string | undefined;

diff --git a/packages/plugin-ext/src/plugin/file-system.ts b/packages/plugin-ext/src/plugin/file-system.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { PLUGIN_RPC_CONTEXT, FileSystemExt, FileSystemMain } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';

diff --git a/packages/plugin-ext/src/plugin/in-plugin-filesystem-watcher-proxy.ts b/packages/plugin-ext/src/plugin/in-plugin-filesystem-watcher-proxy.ts
@@ -18,7 +18,7 @@ import * as theia from '@theia/plugin';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { WorkspaceMain } from '../common/plugin-api-rpc';
 import { FileWatcherSubscriberOptions, FileChangeEventType } from '../common/plugin-api-rpc-model';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 
 /**
  * This class is responsible for file watchers subscription registering and file system events proxying.

diff --git a/packages/plugin-ext/src/plugin/known-commands.spec.ts b/packages/plugin-ext/src/plugin/known-commands.spec.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert';
 import { KnownCommands } from './known-commands';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { Position } from './types-impl';
 import { fromPosition } from './type-converters';
 

diff --git a/packages/plugin-ext/src/plugin/known-commands.ts b/packages/plugin-ext/src/plugin/known-commands.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import { Range as R, Position as P, Location as L } from 'vscode-languageserver-types';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { cloneAndChange } from '../common/objects';
 import { Position, Range, Location, CallHierarchyItem } from './types-impl';

diff --git a/packages/plugin-ext/src/plugin/languages.ts b/packages/plugin-ext/src/plugin/languages.ts
@@ -33,7 +33,7 @@ import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from './documents';
 import { PluginModel } from '../common/plugin-protocol';
 import { Disposable } from './types-impl';
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import { UriComponents } from '../common/uri-components';
 import {
     CompletionContext,

diff --git a/packages/plugin-ext/src/plugin/languages/call-hierarchy.ts b/packages/plugin-ext/src/plugin/languages/call-hierarchy.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import * as Converter from '../type-converters';
 import { DocumentsExtImpl } from '../documents';

diff --git a/packages/plugin-ext/src/plugin/languages/code-action.ts b/packages/plugin-ext/src/plugin/languages/code-action.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import * as theia from '@theia/plugin';
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import { Selection } from '../../common/plugin-api-rpc';
 import { Range, CodeActionContext, CodeAction } from '../../common/plugin-api-rpc-model';
 import * as Converter from '../type-converters';

diff --git a/packages/plugin-ext/src/plugin/languages/color.ts b/packages/plugin-ext/src/plugin/languages/color.ts
@@ -15,7 +15,7 @@
  ********************************************************************************/
 
 import * as theia from '@theia/plugin';
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import { DocumentsExtImpl } from '../documents';
 import * as Converter from '../type-converters';
 import { RawColorInfo } from '../../common/plugin-api-rpc';

diff --git a/packages/plugin-ext/src/plugin/languages/completion.ts b/packages/plugin-ext/src/plugin/languages/completion.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { CompletionList, Range, SnippetString } from '../types-impl';
 import { DocumentsExtImpl } from '../documents';

diff --git a/packages/plugin-ext/src/plugin/languages/declaration.ts b/packages/plugin-ext/src/plugin/languages/declaration.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as types from '../types-impl';

diff --git a/packages/plugin-ext/src/plugin/languages/definition.ts b/packages/plugin-ext/src/plugin/languages/definition.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as types from '../types-impl';

diff --git a/packages/plugin-ext/src/plugin/languages/diagnostics.ts b/packages/plugin-ext/src/plugin/languages/diagnostics.ts
@@ -21,7 +21,7 @@ import { DiagnosticSeverity, MarkerSeverity } from '../types-impl';
 import { MarkerData } from '../../common/plugin-api-rpc-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { PLUGIN_RPC_CONTEXT, LanguagesMain } from '../../common/plugin-api-rpc';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import { v4 } from 'uuid';
 
 export class DiagnosticCollection implements theia.DiagnosticCollection {

diff --git a/packages/plugin-ext/src/plugin/languages/document-formatting.ts b/packages/plugin-ext/src/plugin/languages/document-formatting.ts
@@ -17,7 +17,7 @@
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as Converter from '../type-converters';
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import { FormattingOptions, TextEdit } from '../../common/plugin-api-rpc-model';
 
 export class DocumentFormattingAdapter {

diff --git a/packages/plugin-ext/src/plugin/languages/document-highlight.ts b/packages/plugin-ext/src/plugin/languages/document-highlight.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as types from '../types-impl';

diff --git a/packages/plugin-ext/src/plugin/languages/folding.ts b/packages/plugin-ext/src/plugin/languages/folding.ts
@@ -16,7 +16,7 @@
 
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as Converter from '../type-converters';
 import * as model from '../../common/plugin-api-rpc-model';
 

diff --git a/packages/plugin-ext/src/plugin/languages/hover.ts b/packages/plugin-ext/src/plugin/languages/hover.ts
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import { Hover } from '../../common/plugin-api-rpc-model';

diff --git a/packages/plugin-ext/src/plugin/languages/implementation.ts b/packages/plugin-ext/src/plugin/languages/implementation.ts
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import URI from 'vscode-uri/lib/umd';
+import { URI } from 'vscode-uri';
 import * as theia from '@theia/plugin';
 import { DocumentsExtImpl } from '../documents';
 import * as types from '../types-impl';