From 39ba1c0702d1814eb9bc15768f865a2fa8278da9 Mon Sep 17 00:00:00 2001
From: Mark Sujew <mark.sujew@typefox.io>
Date: Tue, 24 Oct 2023 17:22:30 +0200
Subject: [PATCH] Remove vscode-uri bundler workaround

---
 package-lock.json                      |  8 ++++----
 packages/langium/package.json          |  2 +-
 packages/langium/src/utils/uri-util.ts | 22 ++++++----------------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3a11c661c..316105477 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8918,9 +8918,9 @@
       "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz",
-      "integrity": "sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA=="
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
+      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
     },
     "node_modules/walk-up-path": {
       "version": "1.0.0",
@@ -9974,7 +9974,7 @@
         "chevrotain-allstar": "~0.3.0",
         "vscode-languageserver": "~9.0.1",
         "vscode-languageserver-textdocument": "~1.0.11",
-        "vscode-uri": "~3.0.7"
+        "vscode-uri": "~3.0.8"
       },
       "devDependencies": {
         "langium-cli": "~2.0.0"
diff --git a/packages/langium/package.json b/packages/langium/package.json
index 8264f55a0..fb882e3b3 100644
--- a/packages/langium/package.json
+++ b/packages/langium/package.json
@@ -62,7 +62,7 @@
     "chevrotain-allstar": "~0.3.0",
     "vscode-languageserver": "~9.0.1",
     "vscode-languageserver-textdocument": "~1.0.11",
-    "vscode-uri": "~3.0.7"
+    "vscode-uri": "~3.0.8"
   },
   "devDependencies": {
     "langium-cli": "~2.0.0"
diff --git a/packages/langium/src/utils/uri-util.ts b/packages/langium/src/utils/uri-util.ts
index 895814c43..44d349d1b 100644
--- a/packages/langium/src/utils/uri-util.ts
+++ b/packages/langium/src/utils/uri-util.ts
@@ -4,27 +4,17 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import * as vscodeUri from 'vscode-uri';
-
-// Node.js and some bundlers don't deal well with the type information in `vscode-uri`
-// This is a workaround to support all runtimes and bundlers
-let uri = vscodeUri;
-if ('default' in uri) {
-    uri = uri.default as typeof uri;
-}
-
-type URI = vscodeUri.URI;
-const URI = uri.URI;
+import { URI, Utils } from 'vscode-uri';
 
 export { URI };
 
 export namespace UriUtils {
 
-    export const basename = uri.Utils.basename;
-    export const dirname = uri.Utils.dirname;
-    export const extname = uri.Utils.extname;
-    export const joinPath = uri.Utils.joinPath;
-    export const resolvePath = uri.Utils.resolvePath;
+    export const basename = Utils.basename;
+    export const dirname = Utils.dirname;
+    export const extname = Utils.extname;
+    export const joinPath = Utils.joinPath;
+    export const resolvePath = Utils.resolvePath;
 
     export function equals(a?: URI | string, b?: URI | string): boolean {
         return a?.toString() === b?.toString();