diff --git a/packages/react-meteor-data/index.js b/packages/react-meteor-data/index.ts
similarity index 88%
rename from packages/react-meteor-data/index.js
rename to packages/react-meteor-data/index.ts
index fe6e73ef..db683db7 100644
--- a/packages/react-meteor-data/index.js
+++ b/packages/react-meteor-data/index.ts
@@ -9,6 +9,6 @@ if (Meteor.isDevelopment) {
 }
 
 export { useTracker } from './useTracker';
-export { withTracker } from './withTracker.tsx';
+export { withTracker } from './withTracker';
 export { useFind } from './useFind';
 export { useSubscribe } from './useSubscribe';
\ No newline at end of file
diff --git a/packages/react-meteor-data/package-types.json b/packages/react-meteor-data/package-types.json
new file mode 100644
index 00000000..043d5816
--- /dev/null
+++ b/packages/react-meteor-data/package-types.json
@@ -0,0 +1,3 @@
+{
+  "typesEntry": "index.ts"
+}
diff --git a/packages/react-meteor-data/package.js b/packages/react-meteor-data/package.js
index 2e069f9e..0ea2411d 100644
--- a/packages/react-meteor-data/package.js
+++ b/packages/react-meteor-data/package.js
@@ -17,10 +17,9 @@ Package.onUse((api) => {
   api.use('tracker')
   api.use('ecmascript')
   api.use('typescript')
-  api.addAssets('react-meteor-data.d.ts', 'server')
-  api.addAssets('suspense/react-meteor-data.d.ts', 'server')
+  api.use('zodern:types', 'server')
 
-  api.mainModule('index.js', ['client', 'server'], { lazy: true })
+  api.mainModule('index.ts', ['client', 'server'], { lazy: true })
 })
 
 Package.onTest((api) => {