Merge branch 'main' into renovate/tanstack-config-digest

AlemTuzlak · web-flow · commit 186d0be8879b · 2026-06-19T13:13:05.000+02:00
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://unpkg.com/@changesets/config@3.1.2/schema.json",
   "changelog": [
-    "@svitejs/changesets-changelog-github-compact",
-    { "repo": "TanStack/devtools" }
+    "@changesets/changelog-github",
+    { "repo": "TanStack/devtools", "disableThanks": true }
   ],
   "commit": false,
   "access": "public",
diff --git a/.changeset/small-papers-wink.md b/.changeset/small-papers-wink.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/devtools-vite': patch
+---
+
+Fix invalid syntax generated when removing parenthesized devtools JSX expressions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -48,18 +48,6 @@ jobs:
         run: pnpm run build:all
       - name: Publish Previews
         run: pnpx pkg-pr-new@0.0.71 publish --pnpm './packages/*' --template './examples/*/*'
-  provenance:
-    name: Provenance
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-      - name: Check Provenance
-        uses: danielroe/provenance-action@41bcc969e579d9e29af08ba44fcbfdf95cee6e6c # v0.1.1
-        with:
-          fail-on-downgrade: true
   version-preview:
     name: Version Preview
     runs-on: ubuntu-latest
diff --git a/examples/preact/basic/package.json b/examples/preact/basic/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@preact/preset-vite": "^2.10.3",
     "@tanstack/devtools-ui": "0.5.2",
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "sonda": "0.9.0",
     "vite": "^8.0.0",
     "vite-plugin-inspect": "11.3.3"
diff --git a/examples/react/a11y-devtools/package.json b/examples/react/a11y-devtools/package.json
@@ -15,7 +15,7 @@
     "react-dom": "^19.2.0"
   },
   "devDependencies": {
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "@types/react": "^19.2.0",
     "@types/react-dom": "^19.2.0",
     "@vitejs/plugin-react": "^6.0.1",
diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@tanstack/devtools-ui": "0.5.2",
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "@tanstack/react-form-devtools": "^0.1.7",
     "@types/react": "^19.2.0",
     "@types/react-dom": "^19.2.0",
diff --git a/examples/react/bundling-repro/package.json b/examples/react/bundling-repro/package.json
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@biomejs/biome": "2.2.4",
     "@tanstack/devtools-event-client": "latest",
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
     "@types/node": "^22.15.2",
diff --git a/examples/react/drizzle/package.json b/examples/react/drizzle/package.json
@@ -16,7 +16,7 @@
     "react-dom": "^19.2.0"
   },
   "devDependencies": {
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "@types/node": "^22.15.2",
     "@types/react": "^19.2.0",
     "@types/react-dom": "^19.2.0",
diff --git a/examples/react/https/package.json b/examples/react/https/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@tanstack/devtools-ui": "0.5.2",
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "@types/react": "^19.2.0",
     "@types/react-dom": "^19.2.0",
     "@vitejs/plugin-react": "^6.0.1",
diff --git a/examples/react/start/package.json b/examples/react/start/package.json
@@ -25,7 +25,7 @@
     "vite-tsconfig-paths": "^6.0.2"
   },
   "devDependencies": {
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
     "@types/node": "^22.15.2",
diff --git a/examples/solid/a11y-devtools/package.json b/examples/solid/a11y-devtools/package.json
@@ -14,7 +14,7 @@
     "solid-js": "^1.9.9"
   },
   "devDependencies": {
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "vite": "^8.0.0",
     "vite-plugin-inspect": "11.3.3",
     "vite-plugin-solid": "^2.11.11"
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
@@ -17,7 +17,7 @@
     "solid-js": "^1.9.9"
   },
   "devDependencies": {
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "vite": "^8.0.0",
     "vite-plugin-inspect": "11.3.3",
     "vite-plugin-solid": "^2.11.11"
diff --git a/examples/solid/devtools-ui/package.json b/examples/solid/devtools-ui/package.json
@@ -14,7 +14,7 @@
     "solid-js": "^1.9.9"
   },
   "devDependencies": {
-    "@tanstack/devtools-vite": "0.7.0",
+    "@tanstack/devtools-vite": "0.7.1",
     "vite": "^8.0.0",
     "vite-plugin-inspect": "11.3.3",
     "vite-plugin-solid": "^2.11.11"
diff --git a/package.json b/package.json
@@ -6,6 +6,9 @@
     "url": "git+https://github.com/TanStack/devtools.git"
   },
   "packageManager": "pnpm@11.1.1",
+  "engines": {
+    "pnpm": ">=11.0.0"
+  },
   "type": "module",
   "scripts": {
     "build": "nx affected --targets=build --exclude=examples/** && size-limit",
@@ -55,10 +58,10 @@
     }
   ],
   "devDependencies": {
+    "@changesets/changelog-github": "^0.7.0",
     "@changesets/cli": "^2.30.0",
     "@faker-js/faker": "^9.9.0",
     "@size-limit/preset-small-lib": "^11.2.0",
-    "@svitejs/changesets-changelog-github-compact": "^1.2.0",
     "@tanstack/eslint-config": "0.3.2",
     "@tanstack/intent": "^0.0.14",
     "@tanstack/typedoc-config": "0.3.3",
diff --git a/packages/devtools-vite/CHANGELOG.md b/packages/devtools-vite/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @tanstack/devtools-event-client
 
+## 0.7.1
+
+### Patch Changes
+
+- [#450](https://github.com/TanStack/devtools/pull/450) [`cf89dcd`](https://github.com/TanStack/devtools/commit/cf89dcd9e0906d89c1b40bd2ddb83d5cd3499514) - fix go to source file whose path contains $ symbol
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/devtools-vite/package.json b/packages/devtools-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/devtools-vite",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "TanStack Vite plugin used to enhance the core devtools with additional functionalities",
   "author": "Tanner Linsley",
   "license": "MIT",
diff --git a/packages/devtools-vite/src/ast-utils.ts b/packages/devtools-vite/src/ast-utils.ts
@@ -48,7 +48,11 @@ export function forEachChild(node: Node, callback: (child: Node) => void) {
 /**
  * Recursively walk AST nodes, calling `visitor` for each node with a `type`.
  */
-export function walk(node: Node, visitor: (node: Node) => void) {
-  visitor(node)
-  forEachChild(node, (child) => walk(child, visitor))
+export function walk(
+  node: Node,
+  visitor: (node: Node, parentNode?: Node) => void,
+  parentNode?: Node,
+) {
+  visitor(node, parentNode)
+  forEachChild(node, (child) => walk(child, visitor, node))
 }
diff --git a/packages/devtools-vite/src/editor.ts b/packages/devtools-vite/src/editor.ts
@@ -28,7 +28,7 @@ export const DEFAULT_EDITOR_CONFIG: EditorConfig = {
   open: async (path, lineNumber, columnNumber) => {
     const launch = (await import('launch-editor')).default
     launch(
-      `${path.replaceAll('$', '\\$')}${lineNumber ? `:${lineNumber}` : ''}${columnNumber ? `:${columnNumber}` : ''}`,
+      `${path}${lineNumber ? `:${lineNumber}` : ''}${columnNumber ? `:${columnNumber}` : ''}`,
       undefined,
       (filename, err) => {
         console.warn(`Failed to open ${filename} in editor: ${err}`)
diff --git a/packages/devtools-vite/src/remove-devtools.test.ts b/packages/devtools-vite/src/remove-devtools.test.ts
@@ -577,4 +577,31 @@ export default function App() {
       expect(output!.code).not.toContain('TanStackDevtools')
     })
   })
+
+  test('preserves valid syntax when removing parenthesized devtools return', () => {
+    const output = removeEmptySpace(
+      removeDevtools(
+        `
+import { TanStackDevtools } from '@tanstack/react-devtools'
+
+export function DevtoolsProvider() {
+  return (
+    <TanStackDevtools />
+  )
+}
+`,
+        'test.tsx',
+      )!.code,
+    )
+
+    expect(output).toBe(
+      removeEmptySpace(`
+export function DevtoolsProvider() {
+  return (
+    null
+  )
+}
+`),
+    )
+  })
 })
diff --git a/packages/devtools-vite/src/remove-devtools.ts b/packages/devtools-vite/src/remove-devtools.ts
@@ -105,7 +105,7 @@ export function removeDevtools(code: string, id: string) {
     if (devtoolsNames.size === 0) return
 
     // Pass 2: Find and remove devtools JSX elements, collect plugin references
-    walk(result.program, (node) => {
+    walk(result.program, (node, parentNode) => {
       if (node.type !== 'JSXElement') return
 
       const opening = node.openingElement
@@ -130,7 +130,11 @@ export function removeDevtools(code: string, id: string) {
 
       let end = node.end
       if (code[end] === '\n') end++
-      s.remove(node.start, end)
+      if (parentNode?.type === 'ParenthesizedExpression') {
+        s.overwrite(node.start, end, 'null')
+      } else {
+        s.remove(node.start, end)
+      }
     })
 
     // Pass 3: Remove plugin imports that are no longer referenced
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@tanstack/devtools-vite': patch
 +---
++
 +Fix invalid syntax generated when removing parenthesized devtools JSX expressions.