diff --git a/packages/eslint-plugin-query/package.json b/packages/eslint-plugin-query/package.json
index c2d698a4bc..50ffc15b0e 100644
--- a/packages/eslint-plugin-query/package.json
+++ b/packages/eslint-plugin-query/package.json
@@ -39,10 +39,11 @@
   "module": "dist/index.js",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
         "@tanstack/custom-condition": "./src/index.ts",
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
       },
       "require": {
         "types": "./dist/index.d.cts",
diff --git a/packages/query-async-storage-persister/package.json b/packages/query-async-storage-persister/package.json
index e5a301b311..90d407a2b3 100644
--- a/packages/query-async-storage-persister/package.json
+++ b/packages/query-async-storage-persister/package.json
@@ -40,8 +40,8 @@
   "react-native": "src/index.ts",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/query-broadcast-client-experimental/package.json b/packages/query-broadcast-client-experimental/package.json
index cde7abc677..6843f060d0 100644
--- a/packages/query-broadcast-client-experimental/package.json
+++ b/packages/query-broadcast-client-experimental/package.json
@@ -37,8 +37,8 @@
   "module": "build/legacy/index.js",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/query-core/package.json b/packages/query-core/package.json
index e6f1d76b03..a9e826abc3 100644
--- a/packages/query-core/package.json
+++ b/packages/query-core/package.json
@@ -40,8 +40,8 @@
   "react-native": "src/index.ts",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json
index 1992766a63..2466e34383 100644
--- a/packages/query-devtools/package.json
+++ b/packages/query-devtools/package.json
@@ -40,21 +40,19 @@
   "types": "./build/index.d.ts",
   "browser": {},
   "exports": {
+    "@tanstack/custom-condition": "./src/index.ts",
     "solid": {
-      "@tanstack/custom-condition": "./src/index.ts",
       "development": "./build/index.js",
       "import": "./build/index.js"
     },
     "development": {
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/index.d.ts",
         "default": "./build/dev.js"
       },
       "require": "./build/dev.cjs"
     },
     "import": {
-      "@tanstack/custom-condition": "./src/index.ts",
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
diff --git a/packages/query-persist-client-core/package.json b/packages/query-persist-client-core/package.json
index 3d2ca2b525..4632d6693a 100644
--- a/packages/query-persist-client-core/package.json
+++ b/packages/query-persist-client-core/package.json
@@ -40,8 +40,8 @@
   "react-native": "src/index.ts",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/query-sync-storage-persister/package.json b/packages/query-sync-storage-persister/package.json
index b95ec6b8b2..51b850498a 100644
--- a/packages/query-sync-storage-persister/package.json
+++ b/packages/query-sync-storage-persister/package.json
@@ -40,8 +40,8 @@
   "react-native": "src/index.ts",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
index e8030bf6fb..68a58b200c 100644
--- a/packages/react-query-devtools/package.json
+++ b/packages/react-query-devtools/package.json
@@ -40,8 +40,8 @@
   "module": "build/legacy/index.js",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
@@ -51,8 +51,8 @@
       }
     },
     "./production": {
+      "@tanstack/custom-condition": "./src/production.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/production.ts",
         "types": "./build/modern/production.d.ts",
         "default": "./build/modern/production.js"
       },
@@ -62,8 +62,8 @@
       }
     },
     "./build/modern/production.js": {
+      "@tanstack/custom-condition": "./src/production.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/production.ts",
         "types": "./build/modern/production.d.ts",
         "default": "./build/modern/production.js"
       },
diff --git a/packages/react-query-next-experimental/package.json b/packages/react-query-next-experimental/package.json
index 035a3969e8..343e0e710b 100644
--- a/packages/react-query-next-experimental/package.json
+++ b/packages/react-query-next-experimental/package.json
@@ -37,8 +37,8 @@
   "module": "build/legacy/index.js",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/react-query-persist-client/package.json b/packages/react-query-persist-client/package.json
index a319cdb546..54f8cfd020 100644
--- a/packages/react-query-persist-client/package.json
+++ b/packages/react-query-persist-client/package.json
@@ -40,8 +40,8 @@
   "react-native": "src/index.ts",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/react-query/package.json b/packages/react-query/package.json
index b9a57c8002..6ab3e12c0d 100644
--- a/packages/react-query/package.json
+++ b/packages/react-query/package.json
@@ -42,8 +42,8 @@
   "react-native": "src/index.ts",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },
diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json
index 1a81af1ab8..257065bdfa 100644
--- a/packages/solid-query-devtools/package.json
+++ b/packages/solid-query-devtools/package.json
@@ -37,21 +37,19 @@
   "types": "./build/index.d.ts",
   "browser": {},
   "exports": {
+    "@tanstack/custom-condition": "./src/index.tsx",
     "solid": {
-      "@tanstack/custom-condition": "./src/index.tsx",
       "development": "./build/dev.jsx",
       "import": "./build/index.jsx"
     },
     "development": {
       "import": {
-        "@tanstack/custom-condition": "./src/index.tsx",
         "types": "./build/index.d.ts",
         "default": "./build/dev.js"
       },
       "require": "./build/dev.cjs"
     },
     "import": {
-      "@tanstack/custom-condition": "./src/index.tsx",
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json
index 8b16c96564..487777c403 100644
--- a/packages/solid-query-persist-client/package.json
+++ b/packages/solid-query-persist-client/package.json
@@ -37,9 +37,9 @@
   "main": "./build/index.cjs",
   "module": "./build/index.js",
   "exports": {
+    "@tanstack/custom-condition": "./src/index.ts",
     "development": {
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/index.d.ts",
         "default": "./build/dev.js"
       },
@@ -49,7 +49,6 @@
       }
     },
     "import": {
-      "@tanstack/custom-condition": "./src/index.ts",
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
index cd2da1c4ae..3da6335d31 100644
--- a/packages/solid-query/package.json
+++ b/packages/solid-query/package.json
@@ -40,9 +40,9 @@
   "types": "./build/index.d.ts",
   "browser": {},
   "exports": {
+    "@tanstack/custom-condition": "./src/index.ts",
     "development": {
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/index.d.ts",
         "default": "./build/dev.js"
       },
@@ -52,7 +52,6 @@
       }
     },
     "import": {
-      "@tanstack/custom-condition": "./src/index.ts",
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
diff --git a/packages/vue-query/package.json b/packages/vue-query/package.json
index b678e975af..b773f4ebff 100644
--- a/packages/vue-query/package.json
+++ b/packages/vue-query/package.json
@@ -42,8 +42,8 @@
   "module": "build/legacy/index.js",
   "exports": {
     ".": {
+      "@tanstack/custom-condition": "./src/index.ts",
       "import": {
-        "@tanstack/custom-condition": "./src/index.ts",
         "types": "./build/modern/index.d.ts",
         "default": "./build/modern/index.js"
       },