From dccede4318b46ada5d0df55a3ebfb7c6a121f09f Mon Sep 17 00:00:00 2001
From: Wonsuk Choi <sukvvon@gmail.com>
Date: Mon, 1 Jun 2026 00:42:19 +0900
Subject: [PATCH 1/3] chore(solid-query-devtools/tsconfig): include
 'test-setup.ts' for jest-dom matcher typings (#10845)

---
 packages/solid-query-devtools/tsconfig.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/solid-query-devtools/tsconfig.json b/packages/solid-query-devtools/tsconfig.json
index 23e421b5861..0ab39f06302 100644
--- a/packages/solid-query-devtools/tsconfig.json
+++ b/packages/solid-query-devtools/tsconfig.json
@@ -6,6 +6,12 @@
     "jsx": "preserve",
     "jsxImportSource": "solid-js"
   },
-  "include": ["src", "*.config.ts", "*.config.js", "package.json"],
+  "include": [
+    "src",
+    "test-setup.ts",
+    "*.config.ts",
+    "*.config.js",
+    "package.json"
+  ],
   "references": [{ "path": "../query-devtools" }, { "path": "../solid-query" }]
 }

From 2c4d9b16bbfedb7584b932804c89f26b197d7df7 Mon Sep 17 00:00:00 2001
From: Wonsuk Choi <sukvvon@gmail.com>
Date: Mon, 1 Jun 2026 00:51:52 +0900
Subject: [PATCH 2/3] test(solid-query-devtools/devtoolsPanel): use
 'toHaveStyle' matcher in the 'style' merge cases (#10846)

---
 .../src/__tests__/devtoolsPanel.test.tsx       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx b/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx
index 745c7e471c1..d5afd698052 100644
--- a/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx
+++ b/packages/solid-query-devtools/src/__tests__/devtoolsPanel.test.tsx
@@ -130,12 +130,11 @@ describe('SolidQueryDevtoolsPanel', () => {
         style={{ width: '300px' }}
       />
     ))
-    const panel = container.querySelector(
-      '.tsqd-parent-container',
-    ) as HTMLElement
 
-    expect(panel.style.height).toBe('500px')
-    expect(panel.style.width).toBe('300px')
+    expect(container.querySelector('.tsqd-parent-container')).toHaveStyle({
+      height: '500px',
+      width: '300px',
+    })
   })
 
   it('should let "style" override the default container height on the rendered element', () => {
@@ -147,12 +146,11 @@ describe('SolidQueryDevtoolsPanel', () => {
         style={{ width: '300px', height: '300px' }}
       />
     ))
-    const panel = container.querySelector(
-      '.tsqd-parent-container',
-    ) as HTMLElement
 
-    expect(panel.style.height).toBe('300px')
-    expect(panel.style.width).toBe('300px')
+    expect(container.querySelector('.tsqd-parent-container')).toHaveStyle({
+      height: '300px',
+      width: '300px',
+    })
   })
 
   it('should call "unmount" on the devtools instance when the component unmounts', () => {

From c27d3661f09c0a60ee58c85c8a1d4a8e04e71f3d Mon Sep 17 00:00:00 2001
From: Kevin Van Cott <kevinvandy656@gmail.com>
Date: Sun, 31 May 2026 13:02:55 -0400
Subject: [PATCH 3/3] chore: add conditional check for repository owner in
 release job (#10847)

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3f0cee6c1b7..8f950f033ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,7 @@ permissions:
 jobs:
   release:
     name: Release
+    if: github.repository_owner == 'TanStack'
     runs-on: ubuntu-latest
     permissions:
       contents: write