diff --git a/packages/solid-query-devtools/.attw.json b/packages/solid-query-devtools/.attw.json
new file mode 100644
index 0000000000..de5330c3cd
--- /dev/null
+++ b/packages/solid-query-devtools/.attw.json
@@ -0,0 +1,3 @@
+{
+  "ignoreRules": ["no-resolution"]
+}
diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json
index 89c98300c3..597814373e 100644
--- a/packages/solid-query-devtools/package.json
+++ b/packages/solid-query-devtools/package.json
@@ -32,28 +32,60 @@
     "build:dev": "tsup --watch"
   },
   "type": "module",
-  "main": "./build/index.cjs",
-  "module": "./build/index.js",
-  "types": "./build/index.d.ts",
+  "main": "./build/index/index.cjs",
+  "module": "./build/index/index.js",
+  "types": "./build/index/index.d.ts",
   "browser": {},
   "exports": {
-    "@tanstack/custom-condition": "./src/index.ts",
-    "solid": {
-      "development": "./build/dev.jsx",
-      "import": "./build/index.jsx"
+    ".": {
+      "@tanstack/custom-condition": "./src/index.tsx",
+      "solid": {
+        "development": "./build/index/dev.jsx",
+        "import": "./build/index/index.jsx"
+      },
+      "development": {
+        "import": {
+          "types": "./build/index/index.d.ts",
+          "default": "./build/index/dev.js"
+        },
+        "require": "./build/index/dev.cjs"
+      },
+      "import": {
+        "types": "./build/index/index.d.ts",
+        "default": "./build/index/index.js"
+      },
+      "require": "./build/index/index.cjs"
     },
-    "development": {
+    "./production": {
+      "@tanstack/custom-condition": "./src/production.tsx",
+      "solid": {
+        "development": "./build/production/dev.jsx",
+        "import": "./build/production/index.jsx"
+      },
+      "development": {
+        "import": {
+          "types": "./build/production/index.d.ts",
+          "default": "./build/production/dev.js"
+        },
+        "require": "./build/production/dev.cjs"
+      },
       "import": {
-        "types": "./build/index.d.ts",
-        "default": "./build/dev.js"
+        "types": "./build/production/index.d.ts",
+        "default": "./build/production/index.js"
       },
-      "require": "./build/dev.cjs"
+      "require": "./build/production/index.cjs"
     },
-    "import": {
-      "types": "./build/index.d.ts",
-      "default": "./build/index.js"
+    "./build/production/index.js": {
+      "import": {
+        "types": "./build/production/index.d.ts",
+        "default": "./build/production/index.js"
+      },
+      "require": {
+        "types": "./build/production/index.d.cts",
+        "default": "./build/production/index.cjs"
+      }
     },
-    "require": "./build/index.cjs"
+    "./package.json": "./package.json"
   },
   "files": [
     "build",
diff --git a/packages/solid-query-devtools/src/production.tsx b/packages/solid-query-devtools/src/production.tsx
new file mode 100644
index 0000000000..d32f7fd446
--- /dev/null
+++ b/packages/solid-query-devtools/src/production.tsx
@@ -0,0 +1,12 @@
+import clientOnly from './clientOnly'
+import type SolidQueryDevtoolsComp from './devtools'
+import type SolidQueryDevtoolsCompPanel from './devtoolsPanel'
+
+export const SolidQueryDevtools: typeof SolidQueryDevtoolsComp = clientOnly(
+  () => import('./devtools'),
+)
+
+export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel =
+  clientOnly(() => import('./devtoolsPanel'))
+
+export type { DevtoolsPanelOptions } from './devtoolsPanel'
diff --git a/packages/solid-query-devtools/tsup.config.ts b/packages/solid-query-devtools/tsup.config.ts
index 09316c5110..2bcbaf9cfb 100644
--- a/packages/solid-query-devtools/tsup.config.ts
+++ b/packages/solid-query-devtools/tsup.config.ts
@@ -2,10 +2,17 @@ import { defineConfig } from 'tsup'
 import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid'
 
 const preset_options = {
-  entries: {
-    entry: 'src/index.tsx',
-    dev_entry: true,
-  },
+  entries: [
+    {
+      entry: 'src/index.tsx',
+      dev_entry: true,
+    },
+    {
+      name: 'production',
+      entry: 'src/production.tsx',
+      dev_entry: true,
+    },
+  ],
   cjs: true,
   drop_console: true,
 }