diff --git a/package.json b/package.json
index a0887793..32e2f685 100644
--- a/package.json
+++ b/package.json
@@ -83,8 +83,7 @@
     "@metamask/eslint-config-jest": "^15.0.0",
     "@metamask/eslint-config-nodejs": "^15.0.0",
     "@metamask/eslint-config-typescript": "^15.0.0",
-    "@ts-bridge/cli": "^0.1.2",
-    "@ts-bridge/shims": "^0.1.1",
+    "@ts-bridge/cli": "^0.6.4",
     "@types/jest": "^30.0.0",
     "@types/jest-when": "^3.5.3",
     "@types/node": "~18.18.14",
diff --git a/yarn.lock b/yarn.lock
index a8d838e9..3845b61b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1199,8 +1199,7 @@ __metadata:
     "@metamask/superstruct": "npm:^3.4.1"
     "@noble/hashes": "npm:^1.8.0"
     "@scure/base": "npm:^1.2.6"
-    "@ts-bridge/cli": "npm:^0.1.2"
-    "@ts-bridge/shims": "npm:^0.1.1"
+    "@ts-bridge/cli": "npm:^0.6.4"
     "@types/debug": "npm:^4.1.7"
     "@types/jest": "npm:^30.0.0"
     "@types/jest-when": "npm:^3.5.3"
@@ -1897,30 +1896,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ts-bridge/cli@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "@ts-bridge/cli@npm:0.1.2"
+"@ts-bridge/cli@npm:^0.6.4":
+  version: 0.6.4
+  resolution: "@ts-bridge/cli@npm:0.6.4"
   dependencies:
+    "@ts-bridge/resolver": "npm:^0.2.0"
     chalk: "npm:^5.3.0"
-    resolve.exports: "npm:^2.0.2"
+    cjs-module-lexer: "npm:^1.3.1"
     yargs: "npm:^17.7.2"
   peerDependencies:
-    "@ts-bridge/shims": ^0.1.1
     typescript: ">=4.8.0"
-  peerDependenciesMeta:
-    "@ts-bridge/shims":
-      optional: true
   bin:
     ts-bridge: ./dist/index.js
     tsbridge: ./dist/index.js
-  checksum: 10/604b9271cd96446708f21d229af8372768bd87701dd0a02895da9d1e9c746f75fd5144a4854bbed44b25438e68f6b4694b12d0ba2721f17fce5fbdc99fbee9fe
+  checksum: 10/257ee0cacec71c1b3cc018825088e06b4bd554ba5fe95bdb98c4c82edd6cd4bcff1054d351e6c7cdfdd3bd2145a055b5d14fa453a6ece761645e42b48b88e9a0
   languageName: node
   linkType: hard
 
-"@ts-bridge/shims@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "@ts-bridge/shims@npm:0.1.1"
-  checksum: 10/df15df15450f0a6305033655a0afa2458a76362d644eab046d9899b9dc9ba200023144dc8d80040f68cd74f12ba4f2da2ea2c4c950d552ff66688eccd658e2f0
+"@ts-bridge/resolver@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@ts-bridge/resolver@npm:0.2.0"
+  checksum: 10/d4cfd1f47e9648a5f9c893b1b076adabde3a57cbe81ef823bcbbcc77a122fb6f06d99f40ff48198f8dc766bfc4b3b351d4e87cfcf2db64f7e6db924eb82a5db1
   languageName: node
   linkType: hard
 
@@ -3160,6 +3156,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cjs-module-lexer@npm:^1.3.1":
+  version: 1.4.3
+  resolution: "cjs-module-lexer@npm:1.4.3"
+  checksum: 10/d2b92f919a2dedbfd61d016964fce8da0035f827182ed6839c97cac56e8a8077cfa6a59388adfe2bc588a19cef9bbe830d683a76a6e93c51f65852062cfe2591
+  languageName: node
+  linkType: hard
+
 "cjs-module-lexer@npm:^2.2.0":
   version: 2.2.1
   resolution: "cjs-module-lexer@npm:2.2.1"
@@ -6916,13 +6919,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve.exports@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "resolve.exports@npm:2.0.2"
-  checksum: 10/f1cc0b6680f9a7e0345d783e0547f2a5110d8336b3c2a4227231dd007271ffd331fd722df934f017af90bae0373920ca0d4005da6f76cb3176c8ae426370f893
-  languageName: node
-  linkType: hard
-
 "resolve@npm:1.22.8, resolve@npm:^1.10.0, resolve@npm:^1.22.3":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"