diff --git a/packages/intl-messageformat/index.ts b/packages/intl-messageformat/index.ts
index c8c4dc9750..f39a74ab30 100644
--- a/packages/intl-messageformat/index.ts
+++ b/packages/intl-messageformat/index.ts
@@ -5,7 +5,8 @@ See the accompanying LICENSE file for terms.
 */
 
 import {IntlMessageFormat} from './src/core'
-export * from './src/formatters'
 export * from './src/core'
 export * from './src/error'
+export * from './src/formatters'
+export {IntlMessageFormat}
 export default IntlMessageFormat
diff --git a/tools/index.bzl b/tools/index.bzl
index 8b6cbf5534..0cd04df27e 100644
--- a/tools/index.bzl
+++ b/tools/index.bzl
@@ -59,7 +59,6 @@ def ts_compile(name, srcs, deps = [], data = [], package = None, skip_esm = True
         visibility: visibility
     """
     deps = deps + ["//:node_modules/tslib"]
-    internal_deps = [d for d in deps if is_internal_dep(d)]
     ts_project(
         name = "%s-base" % name,
         srcs = srcs,
diff --git a/tsconfig.esm.esnext.json b/tsconfig.esm.esnext.json
index 87ba43b740..d07363a01a 100644
--- a/tsconfig.esm.esnext.json
+++ b/tsconfig.esm.esnext.json
@@ -1,6 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "esnext"
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "Bundler"
   }
 }
\ No newline at end of file
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
index dd3367cc92..7872662a1d 100644
--- a/tsconfig.esm.json
+++ b/tsconfig.esm.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "NodeNext"
+    "module": "ESNext",
+    "moduleResolution": "Bundler"
   }
 }
\ No newline at end of file
diff --git a/tsconfig.node.json b/tsconfig.node.json
index 69a8b6c823..afd8478d29 100644
--- a/tsconfig.node.json
+++ b/tsconfig.node.json
@@ -2,7 +2,5 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "target": "ES2021",
-    "moduleResolution": "NodeNext",
-    "module": "nodenext"
   }
-}
+}
\ No newline at end of file