From 27d0f5958013f4f3b0a0e2a6119a93f073708ef2 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Thu, 14 Aug 2025 11:55:26 +0800 Subject: [PATCH 1/8] allow devtools panel in production build --- packages/react-query-devtools/src/index.ts | 7 +------ packages/solid-query-devtools/src/index.tsx | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/react-query-devtools/src/index.ts b/packages/react-query-devtools/src/index.ts index f0636e62b8..b5bc636172 100644 --- a/packages/react-query-devtools/src/index.ts +++ b/packages/react-query-devtools/src/index.ts @@ -10,11 +10,6 @@ export const ReactQueryDevtools: (typeof Devtools)['ReactQueryDevtools'] = } : Devtools.ReactQueryDevtools -export const ReactQueryDevtoolsPanel: (typeof DevtoolsPanel)['ReactQueryDevtoolsPanel'] = - process.env.NODE_ENV !== 'development' - ? function () { - return null - } - : DevtoolsPanel.ReactQueryDevtoolsPanel +export const ReactQueryDevtoolsPanel: (typeof DevtoolsPanel)['ReactQueryDevtoolsPanel'] = DevtoolsPanel.ReactQueryDevtoolsPanel export type DevtoolsPanelOptions = DevtoolsPanel.DevtoolsPanelOptions diff --git a/packages/solid-query-devtools/src/index.tsx b/packages/solid-query-devtools/src/index.tsx index e6fd3ba983..84702d1336 100644 --- a/packages/solid-query-devtools/src/index.tsx +++ b/packages/solid-query-devtools/src/index.tsx @@ -9,10 +9,6 @@ export const SolidQueryDevtools: typeof SolidQueryDevtoolsComp = isDev return null } -export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel = isDev - ? clientOnly(() => import('./devtoolsPanel')) - : function () { - return null - } +export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel = clientOnly(() => import('./devtoolsPanel')) export type { DevtoolsPanelOptions } from './devtoolsPanel' From 770dd673e02ed461f51aa0d9a38e3c0982eac134 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 04:01:35 +0000 Subject: [PATCH 2/8] ci: apply automated fixes --- packages/react-query-devtools/src/index.ts | 3 ++- packages/solid-query-devtools/src/index.tsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/react-query-devtools/src/index.ts b/packages/react-query-devtools/src/index.ts index b5bc636172..1d098e6eae 100644 --- a/packages/react-query-devtools/src/index.ts +++ b/packages/react-query-devtools/src/index.ts @@ -10,6 +10,7 @@ export const ReactQueryDevtools: (typeof Devtools)['ReactQueryDevtools'] = } : Devtools.ReactQueryDevtools -export const ReactQueryDevtoolsPanel: (typeof DevtoolsPanel)['ReactQueryDevtoolsPanel'] = DevtoolsPanel.ReactQueryDevtoolsPanel +export const ReactQueryDevtoolsPanel: (typeof DevtoolsPanel)['ReactQueryDevtoolsPanel'] = + DevtoolsPanel.ReactQueryDevtoolsPanel export type DevtoolsPanelOptions = DevtoolsPanel.DevtoolsPanelOptions diff --git a/packages/solid-query-devtools/src/index.tsx b/packages/solid-query-devtools/src/index.tsx index 84702d1336..9ac08a4aa7 100644 --- a/packages/solid-query-devtools/src/index.tsx +++ b/packages/solid-query-devtools/src/index.tsx @@ -9,6 +9,7 @@ export const SolidQueryDevtools: typeof SolidQueryDevtoolsComp = isDev return null } -export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel = clientOnly(() => import('./devtoolsPanel')) +export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel = + clientOnly(() => import('./devtoolsPanel')) export type { DevtoolsPanelOptions } from './devtoolsPanel' From b75b91bddfd8951b34c144713185934f8ddec3ae Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 19 Aug 2025 02:05:08 +0800 Subject: [PATCH 3/8] SolidJS devtools `/production` export --- packages/react-query-devtools/src/index.ts | 6 ++- packages/solid-query-devtools/package.json | 48 ++++++++++++++----- .../solid-query-devtools/src/production.tsx | 12 +++++ packages/solid-query-devtools/tsup.config.ts | 7 ++- 4 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 packages/solid-query-devtools/src/production.tsx diff --git a/packages/react-query-devtools/src/index.ts b/packages/react-query-devtools/src/index.ts index 1d098e6eae..f0636e62b8 100644 --- a/packages/react-query-devtools/src/index.ts +++ b/packages/react-query-devtools/src/index.ts @@ -11,6 +11,10 @@ export const ReactQueryDevtools: (typeof Devtools)['ReactQueryDevtools'] = : Devtools.ReactQueryDevtools export const ReactQueryDevtoolsPanel: (typeof DevtoolsPanel)['ReactQueryDevtoolsPanel'] = - DevtoolsPanel.ReactQueryDevtoolsPanel + process.env.NODE_ENV !== 'development' + ? function () { + return null + } + : DevtoolsPanel.ReactQueryDevtoolsPanel export type DevtoolsPanelOptions = DevtoolsPanel.DevtoolsPanelOptions diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index 88830a4cf3..8e33733c0b 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -37,23 +37,45 @@ "types": "./build/index.d.ts", "browser": {}, "exports": { - "@tanstack/custom-condition": "./src/index.ts", - "solid": { - "development": "./build/dev.jsx", - "import": "./build/index.jsx" - }, - "development": { + ".": { + "@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.d.ts", - "default": "./build/dev.js" + "types": "./build/index/index.d.ts", + "default": "./build/index/index.js" }, - "require": "./build/dev.cjs" + "require": "./build/index/index.cjs" }, - "import": { - "types": "./build/index.d.ts", - "default": "./build/index.js" + "./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/production/index.d.ts", + "default": "./build/production/index.js" + }, + "require": "./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..810dd4d66e 100644 --- a/packages/solid-query-devtools/tsup.config.ts +++ b/packages/solid-query-devtools/tsup.config.ts @@ -2,10 +2,13 @@ import { defineConfig } from 'tsup' import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid' const preset_options = { - entries: { + entries: [{ entry: 'src/index.tsx', dev_entry: true, - }, + }, { + entry: 'src/production.tsx', + dev_entry: true, + }], cjs: true, drop_console: true, } From efac6bfb5c9dff5e671aeeda2ca8dcac1d5376bd Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 19 Aug 2025 02:05:42 +0800 Subject: [PATCH 4/8] fix --- packages/solid-query-devtools/src/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/solid-query-devtools/src/index.tsx b/packages/solid-query-devtools/src/index.tsx index 9ac08a4aa7..be8104ecfa 100644 --- a/packages/solid-query-devtools/src/index.tsx +++ b/packages/solid-query-devtools/src/index.tsx @@ -10,6 +10,10 @@ export const SolidQueryDevtools: typeof SolidQueryDevtoolsComp = isDev } export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel = - clientOnly(() => import('./devtoolsPanel')) + isDev + ? clientOnly(() => import('./devtoolsPanel')) + : function () { + return null + } export type { DevtoolsPanelOptions } from './devtoolsPanel' From d089b9173bc7174b27804a2096d2943103aeb440 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 19 Aug 2025 02:06:47 +0800 Subject: [PATCH 5/8] format --- packages/solid-query-devtools/src/index.tsx | 3 +-- packages/solid-query-devtools/tsup.config.ts | 17 ++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/solid-query-devtools/src/index.tsx b/packages/solid-query-devtools/src/index.tsx index be8104ecfa..e6fd3ba983 100644 --- a/packages/solid-query-devtools/src/index.tsx +++ b/packages/solid-query-devtools/src/index.tsx @@ -9,8 +9,7 @@ export const SolidQueryDevtools: typeof SolidQueryDevtoolsComp = isDev return null } -export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel = - isDev +export const SolidQueryDevtoolsPanel: typeof SolidQueryDevtoolsCompPanel = isDev ? clientOnly(() => import('./devtoolsPanel')) : function () { return null diff --git a/packages/solid-query-devtools/tsup.config.ts b/packages/solid-query-devtools/tsup.config.ts index 810dd4d66e..f289ac0c7a 100644 --- a/packages/solid-query-devtools/tsup.config.ts +++ b/packages/solid-query-devtools/tsup.config.ts @@ -2,13 +2,16 @@ import { defineConfig } from 'tsup' import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid' const preset_options = { - entries: [{ - entry: 'src/index.tsx', - dev_entry: true, - }, { - entry: 'src/production.tsx', - dev_entry: true, - }], + entries: [ + { + entry: 'src/index.tsx', + dev_entry: true, + }, + { + entry: 'src/production.tsx', + dev_entry: true, + }, + ], cjs: true, drop_console: true, } From 6294b2d02136a0d45eaa963a9de09c6dfa1b3eb1 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 19 Aug 2025 11:18:18 +0800 Subject: [PATCH 6/8] fix top level exports --- packages/solid-query-devtools/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index 8e33733c0b..bc9dc5a1a6 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -32,9 +32,9 @@ "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": { ".": { From 2d4a8dc2e89e43f6613eebc14c4c3b52af2055a9 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 19 Aug 2025 11:34:51 +0800 Subject: [PATCH 7/8] fix tests? --- packages/solid-query-devtools/package.json | 10 ++++++++++ packages/solid-query-devtools/tsup.config.ts | 1 + 2 files changed, 11 insertions(+) diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json index bc9dc5a1a6..02a1a6a5ae 100644 --- a/packages/solid-query-devtools/package.json +++ b/packages/solid-query-devtools/package.json @@ -75,6 +75,16 @@ }, "require": "./build/production/index.cjs" }, + "./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" + } + }, "./package.json": "./package.json" }, "files": [ diff --git a/packages/solid-query-devtools/tsup.config.ts b/packages/solid-query-devtools/tsup.config.ts index f289ac0c7a..2bcbaf9cfb 100644 --- a/packages/solid-query-devtools/tsup.config.ts +++ b/packages/solid-query-devtools/tsup.config.ts @@ -8,6 +8,7 @@ const preset_options = { dev_entry: true, }, { + name: 'production', entry: 'src/production.tsx', dev_entry: true, }, From ab610c404d465a9302132db98c64945b936652f0 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 19 Aug 2025 11:40:33 +0800 Subject: [PATCH 8/8] maybe fix? --- packages/solid-query-devtools/.attw.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 packages/solid-query-devtools/.attw.json 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"] +}