diff --git a/js-client/package-lock.json b/js-client/package-lock.json
index 7590505..7c70d77 100644
--- a/js-client/package-lock.json
+++ b/js-client/package-lock.json
@@ -48,7 +48,7 @@
         "rollup": "^4.62.2",
         "ts-jest": "^29.4.11",
         "ts-node": "10.9.2",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "typescript-eslint": "8.64.0",
         "verdaccio": "6.7.4"
       }
@@ -5031,20 +5031,6 @@
         }
       }
     },
-    "node_modules/@nx/eslint/node_modules/typescript": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
-      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
     "node_modules/@nx/jest": {
       "version": "23.1.0",
       "resolved": "https://registry.npmjs.org/@nx/jest/-/jest-23.1.0.tgz",
@@ -18253,6 +18239,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/lerna/node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/lerna/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -24240,9 +24240,9 @@
       "license": "MIT"
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/js-client/package.json b/js-client/package.json
index 471984f..9810aef 100644
--- a/js-client/package.json
+++ b/js-client/package.json
@@ -40,7 +40,7 @@
     "rollup": "^4.62.2",
     "ts-jest": "^29.4.11",
     "ts-node": "10.9.2",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "typescript-eslint": "8.64.0",
     "verdaccio": "6.7.4"
   },
diff --git a/js-client/tsconfig.base.json b/js-client/tsconfig.base.json
index 979490d..1c51d53 100644
--- a/js-client/tsconfig.base.json
+++ b/js-client/tsconfig.base.json
@@ -4,7 +4,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "declaration": false,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
@@ -13,9 +13,8 @@
     "lib": ["ES2022", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
-    "baseUrl": ".",
     "paths": {
-      "@leancodepl/pipe": ["packages/pipe/src/index.ts"]
+      "@leancodepl/pipe": ["./packages/pipe/src/index.ts"]
     }
   }
 }