From 132003fc9435b213fcecf62aab0a289a0f71f96c Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 13 Nov 2026 20:57:27 +0000 Subject: [PATCH] feat: move the devtools to Solid 2 The shell (@tanstack/devtools), devtools-ui and devtools-a11y now render with their own copy of Solid 2 (solid-js and @solidjs/web rc.21+) and drop the solid-js peer, so framework adapters other than Solid are unaffected. @tanstack/solid-devtools and devtools-utils/solid peer on Solid 2. Port notes: effects are split into compute and apply; props are read through `props` (no destructuring) and create-time reads are untracked; store setters write drafts and reconcile layouts; contexts have no default and render as ``; `classList`, `on:` and `Index` are replaced; aria booleans are strings. @neodrag/solid has no Solid 2 build, so sortable lists use @neodrag/core directly. The shell and class-based panels load their chunk through a signal instead of `lazy`, so neither needs a Loading boundary. tsup builds compile JSX with @solidjs/babel-plugin (scripts/tsup-solid-v2.ts). Tests flush after DOM events and timer callbacks, since Solid 2 applies writes on the next flush. The devtools bundle size limit moves from 67 KB to 85 KB: the Solid 2 runtime accounts for the whole increase. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_0117BoWMMJ6aTSA3MvtgJWG2 --- .changeset/devtools-solid-2.md | 13 + .changeset/devtools-vite-solid-2-entry.md | 5 + docs/devtools-utils.md | 2 +- docs/framework/solid/adapter.md | 2 + docs/framework/solid/basic-setup.md | 18 +- docs/framework/solid/guides/custom-plugins.md | 2 +- docs/plugins/a11y.md | 2 +- docs/quick-start.md | 4 +- e2e/apps/solid/package.json | 7 +- e2e/apps/solid/src/index.tsx | 2 +- e2e/apps/solid/tsconfig.json | 2 +- e2e/apps/solid/vite.config.ts | 2 +- examples/solid/a11y-devtools/package.json | 7 +- examples/solid/a11y-devtools/src/index.tsx | 2 +- examples/solid/a11y-devtools/tsconfig.json | 2 +- examples/solid/a11y-devtools/vite.config.ts | 2 +- examples/solid/basic/package.json | 15 +- examples/solid/basic/src/index.tsx | 2 +- examples/solid/basic/tsconfig.json | 2 +- examples/solid/basic/vite.config.ts | 2 +- examples/solid/devtools-ui/package.json | 7 +- examples/solid/devtools-ui/src/index.tsx | 6 +- examples/solid/devtools-ui/tsconfig.json | 2 +- examples/solid/devtools-ui/vite.config.ts | 2 +- knip.json | 8 +- package.json | 6 +- packages/devtools-a11y/package.json | 12 +- .../src/core/components/IssueCard.tsx | 34 +- .../src/core/components/IssueList.tsx | 19 +- .../src/core/components/Settings.tsx | 53 +- .../src/core/components/Shell.tsx | 8 +- .../src/core/components/index.tsx | 2 +- .../src/core/contexts/allyContext.tsx | 55 +- packages/devtools-a11y/src/core/core.tsx | 2 +- packages/devtools-a11y/tests/theme.test.ts | 2 +- packages/devtools-a11y/tsconfig.json | 2 +- packages/devtools-a11y/vite.config.ts | 5 +- packages/devtools-ui/package.json | 8 +- .../devtools-ui/src/components/button.tsx | 2 +- .../devtools-ui/src/components/checkbox.tsx | 2 +- .../devtools-ui/src/components/header.tsx | 28 +- packages/devtools-ui/src/components/input.tsx | 4 +- .../devtools-ui/src/components/main-panel.tsx | 17 +- .../devtools-ui/src/components/section.tsx | 43 +- .../devtools-ui/src/components/select.tsx | 12 +- packages/devtools-ui/src/components/theme.tsx | 35 +- packages/devtools-ui/src/components/tree.tsx | 33 +- packages/devtools-ui/src/styles/use-styles.ts | 8 +- packages/devtools-ui/tests/index.test.ts | 2 +- packages/devtools-ui/tests/test-setup.ts | 33 + packages/devtools-ui/tests/tree.tsx | 7 +- packages/devtools-ui/tsconfig.json | 2 +- packages/devtools-ui/vite.config.ts | 10 +- packages/devtools-utils/package.json | 14 +- .../references/solid.md | 28 +- .../src/solid/class-mount-impl.tsx | 20 +- .../devtools-utils/src/solid/class.test.tsx | 2 +- packages/devtools-utils/src/solid/class.ts | 2 +- packages/devtools-utils/src/solid/panel.tsx | 14 +- packages/devtools-utils/src/solid/plugin.tsx | 4 +- packages/devtools-utils/tsconfig.solid.json | 2 +- packages/devtools-utils/tsup.config.ts | 3 +- .../devtools-utils/vite.config.solid-class.ts | 10 +- packages/devtools-utils/vite.config.solid.ts | 5 +- .../skills/devtools-vite-plugin/SKILL.md | 2 +- packages/devtools-vite/src/plugin.ts | 4 +- packages/devtools/package.json | 21 +- .../skills/devtools-app-setup/SKILL.md | 2 +- .../skills/devtools-plugin-panel/SKILL.md | 2 +- .../devtools/src/components/content-panel.tsx | 4 +- .../devtools/src/components/main-panel.tsx | 14 +- .../src/components/plugin-workspace.tsx | 85 +- .../devtools/src/components/plugins-strip.tsx | 48 +- .../src/components/source-inspector.tsx | 89 +- .../devtools/src/components/tab-content.tsx | 2 +- .../devtools/src/components/trigger.test.tsx | 26 +- packages/devtools/src/components/trigger.tsx | 73 +- .../components/workbench-secondary-tabs.tsx | 12 +- .../src/context/devtools-context.test.ts | 28 +- .../devtools/src/context/devtools-context.tsx | 65 +- packages/devtools/src/context/pip-context.tsx | 60 +- .../src/context/use-devtools-context.ts | 10 +- packages/devtools/src/devtools.tsx | 88 +- .../devtools/src/hooks/use-disable-tabbing.ts | 4 +- .../devtools/src/hooks/use-head-changes.ts | 8 +- packages/devtools/src/hooks/use-modal-host.ts | 150 +- packages/devtools/src/mount-impl.tsx | 15 +- packages/devtools/src/styles/use-styles.ts | 8 +- packages/devtools/src/tabs/hotkey-config.tsx | 4 +- .../src/tabs/marketplace/plugin-card.tsx | 31 +- .../src/tabs/marketplace/plugin-section.tsx | 16 +- .../src/tabs/marketplace/tag-filters.tsx | 16 +- .../devtools/src/tabs/plugin-marketplace.tsx | 16 +- .../devtools/src/tabs/settings-tab.test.tsx | 7 +- .../devtools/src/utils/create-sortable.ts | 32 + .../devtools/src/utils/native-listener.ts | 16 + packages/devtools/tests/index.test.ts | 5 +- .../devtools/tests/seo-workbench.test.tsx | 2 +- packages/devtools/tests/test-setup.ts | 33 + .../tests/workbench-secondary-tabs.test.tsx | 2 +- packages/devtools/tests/workbench.test.tsx | 22 +- packages/devtools/tsconfig.json | 2 +- packages/devtools/tsup.config.ts | 3 +- packages/devtools/vite.config.ts | 10 +- packages/solid-devtools/package.json | 8 +- packages/solid-devtools/src/client-only.ts | 54 - packages/solid-devtools/src/core.tsx | 128 +- packages/solid-devtools/src/devtools.tsx | 6 +- packages/solid-devtools/tsconfig.json | 2 +- packages/solid-devtools/vite.config.ts | 10 +- pnpm-lock.yaml | 4855 ++++------------- pnpm-workspace.yaml | 6 + scripts/tsup-solid-v2.ts | 60 + 113 files changed, 2277 insertions(+), 4559 deletions(-) create mode 100644 .changeset/devtools-solid-2.md create mode 100644 .changeset/devtools-vite-solid-2-entry.md create mode 100644 packages/devtools/src/utils/create-sortable.ts create mode 100644 packages/devtools/src/utils/native-listener.ts delete mode 100644 packages/solid-devtools/src/client-only.ts create mode 100644 scripts/tsup-solid-v2.ts diff --git a/.changeset/devtools-solid-2.md b/.changeset/devtools-solid-2.md new file mode 100644 index 000000000..6276998c1 --- /dev/null +++ b/.changeset/devtools-solid-2.md @@ -0,0 +1,13 @@ +--- +'@tanstack/devtools': minor +'@tanstack/devtools-ui': minor +'@tanstack/devtools-a11y': minor +'@tanstack/devtools-utils': minor +'@tanstack/solid-devtools': minor +--- + +Move the devtools to Solid 2. They require `solid-js` and `@solidjs/web` 2.0.0-rc.21 or later. + +- `@tanstack/devtools`, `@tanstack/devtools-ui` and `@tanstack/devtools-a11y` render with their own copy of Solid 2 and no longer have a `solid-js` peer, so React, Vue, Svelte, Angular and Preact apps are unaffected. A Solid 1 app that uses them bundles a second copy of Solid in development. +- `@tanstack/solid-devtools` and `@tanstack/devtools-utils/solid` are for Solid 2 apps. Solid 1 apps stay on `@tanstack/solid-devtools` 0.8.x and `@tanstack/devtools-utils` 0.7.x. +- Panels built on `@tanstack/devtools-ui` 0.7.x keep working, because they render with their own Solid 1 copy. Moving a panel to `@tanstack/devtools-ui` 0.8 means moving it to Solid 2. diff --git a/.changeset/devtools-vite-solid-2-entry.md b/.changeset/devtools-vite-solid-2-entry.md new file mode 100644 index 000000000..2abb7a1bd --- /dev/null +++ b/.changeset/devtools-vite-solid-2-entry.md @@ -0,0 +1,5 @@ +--- +'@tanstack/devtools-vite': patch +--- + +Detect Solid 2 entry files, which render from `@solidjs/web`, when injecting console piping. diff --git a/docs/devtools-utils.md b/docs/devtools-utils.md index 76f3dcc2b..47f699b71 100644 --- a/docs/devtools-utils.md +++ b/docs/devtools-utils.md @@ -210,7 +210,7 @@ const [MyPlugin, NoOpPlugin] = createSolidPlugin({ ### createSolidPanel -Solid also provides a class-based panel factory. It uses `createSignal` and `onMount`/`onCleanup` instead of React hooks: +Solid also provides a class-based panel factory. It creates the core instance once, mounts it in `onSettled`, and unmounts it from the cleanup that `onSettled` returns: ```ts import { createSolidPanel } from '@tanstack/devtools-utils/solid' diff --git a/docs/framework/solid/adapter.md b/docs/framework/solid/adapter.md index 247ca8cfb..e0533e0e4 100644 --- a/docs/framework/solid/adapter.md +++ b/docs/framework/solid/adapter.md @@ -11,6 +11,8 @@ If you are using TanStack Devtools in a Solid application, we recommend using th npm install -D @tanstack/solid-devtools ``` +`@tanstack/solid-devtools` requires Solid 2 (`solid-js` and `@solidjs/web` 2.0.0-rc.21 or later). Solid 1 apps stay on `@tanstack/solid-devtools` 0.8.x. + ## Solid Hooks TODO diff --git a/docs/framework/solid/basic-setup.md b/docs/framework/solid/basic-setup.md index a5577eb3d..22e87348a 100644 --- a/docs/framework/solid/basic-setup.md +++ b/docs/framework/solid/basic-setup.md @@ -13,19 +13,25 @@ Install the [TanStack Devtools](https://www.npmjs.com/package/@tanstack/solid-de npm i -D @tanstack/solid-devtools ``` +The Solid adapter requires Solid 2 (`solid-js` and `@solidjs/web` 2.0.0-rc.21 or later). + Next in the root of your application import the `TanStackDevtools` from the required framework adapter (in this case @tanstack/solid-devtools). ```tsx +import { render } from '@solidjs/web' import { TanStackDevtools } from '@tanstack/solid-devtools' import App from './App' -createRoot(document.getElementById('root')!).render( - - +render( + () => ( + <> + - - , + + + ), + document.getElementById('root')!, ) ``` @@ -38,7 +44,7 @@ Currently TanStack offers: - `FormDevtools` ```tsx -import { render } from 'solid-js/web'; +import { render } from '@solidjs/web'; import { TanStackDevtools } from '@tanstack/solid-devtools' diff --git a/docs/framework/solid/guides/custom-plugins.md b/docs/framework/solid/guides/custom-plugins.md index 867ac3e90..20ee86c81 100644 --- a/docs/framework/solid/guides/custom-plugins.md +++ b/docs/framework/solid/guides/custom-plugins.md @@ -139,7 +139,7 @@ This step follows what's shown in [basic-setup](../basic-setup) for a more docum index.tsx ```tsx -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { TanStackDevtools } from '@tanstack/solid-devtools' import { DevtoolPanel } from './DevtoolPanel' diff --git a/docs/plugins/a11y.md b/docs/plugins/a11y.md index 46caf98cf..60debf5ea 100644 --- a/docs/plugins/a11y.md +++ b/docs/plugins/a11y.md @@ -45,7 +45,7 @@ createRoot(document.getElementById('root')!).render( ## Quick Start (Solid) ```tsx -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { TanStackDevtools } from '@tanstack/solid-devtools' import { a11yDevtoolsPlugin } from '@tanstack/devtools-a11y/solid' diff --git a/docs/quick-start.md b/docs/quick-start.md index ea6617177..d44164816 100644 --- a/docs/quick-start.md +++ b/docs/quick-start.md @@ -120,7 +120,7 @@ npm install -D @tanstack/solid-devtools @tanstack/devtools-vite Add the `TanStackDevtools` component using Solid's `render(() => ...)` pattern: ```tsx -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { TanStackDevtools } from '@tanstack/solid-devtools' import App from './App' @@ -136,7 +136,7 @@ render(() => ( To add plugins, pass them via the `plugins` prop: ```tsx -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { TanStackDevtools } from '@tanstack/solid-devtools' import { SolidQueryDevtoolsPanel } from '@tanstack/solid-query-devtools' import { TanStackRouterDevtoolsPanel } from '@tanstack/solid-router-devtools' diff --git a/e2e/apps/solid/package.json b/e2e/apps/solid/package.json index c990a4443..16df9a00e 100644 --- a/e2e/apps/solid/package.json +++ b/e2e/apps/solid/package.json @@ -10,15 +10,16 @@ "test:e2e": "playwright test" }, "dependencies": { + "@solidjs/web": "^2.0.0-rc.21", "@tanstack/devtools-e2e": "workspace:*", "@tanstack/solid-devtools": "workspace:*", - "solid-js": "^1.9.13" + "solid-js": "^2.0.0-rc.21" }, "devDependencies": { "@playwright/test": "^1.49.0", + "@solidjs/vite-plugin": "^3.0.0-next.57", "@tanstack/devtools-vite": "workspace:*", "typescript": "~5.9.2", - "vite": "^8.0.0", - "vite-plugin-solid": "^2.11.11" + "vite": "^8.0.0" } } diff --git a/e2e/apps/solid/src/index.tsx b/e2e/apps/solid/src/index.tsx index 32d06c193..68bd2f9da 100644 --- a/e2e/apps/solid/src/index.tsx +++ b/e2e/apps/solid/src/index.tsx @@ -1,4 +1,4 @@ -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { TanStackDevtools } from '@tanstack/solid-devtools' function DemoPlugin() { diff --git a/e2e/apps/solid/tsconfig.json b/e2e/apps/solid/tsconfig.json index 58c664612..8235f055f 100644 --- a/e2e/apps/solid/tsconfig.json +++ b/e2e/apps/solid/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../../tsconfig.json", "compilerOptions": { "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", "module": "ESNext", "moduleResolution": "Bundler", "noEmit": true, diff --git a/e2e/apps/solid/vite.config.ts b/e2e/apps/solid/vite.config.ts index 98f0b7f1d..227b430cd 100644 --- a/e2e/apps/solid/vite.config.ts +++ b/e2e/apps/solid/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'vite' -import solid from 'vite-plugin-solid' +import solid from '@solidjs/vite-plugin' import { devtools } from '@tanstack/devtools-vite' export default defineConfig({ diff --git a/examples/solid/a11y-devtools/package.json b/examples/solid/a11y-devtools/package.json index b65271996..49ff1b3d5 100644 --- a/examples/solid/a11y-devtools/package.json +++ b/examples/solid/a11y-devtools/package.json @@ -9,15 +9,16 @@ "test:types": "tsc" }, "dependencies": { + "@solidjs/web": "^2.0.0-rc.21", "@tanstack/devtools-a11y": "workspace:*", "@tanstack/solid-devtools": "^0.8.14", - "solid-js": "^1.9.13" + "solid-js": "^2.0.0-rc.21" }, "devDependencies": { + "@solidjs/vite-plugin": "^3.0.0-next.57", "@tanstack/devtools-vite": "0.8.6", "vite": "^8.0.0", - "vite-plugin-inspect": "11.3.3", - "vite-plugin-solid": "^2.11.11" + "vite-plugin-inspect": "11.3.3" }, "browserslist": { "production": [ diff --git a/examples/solid/a11y-devtools/src/index.tsx b/examples/solid/a11y-devtools/src/index.tsx index 173d34e9f..405ee2bb8 100644 --- a/examples/solid/a11y-devtools/src/index.tsx +++ b/examples/solid/a11y-devtools/src/index.tsx @@ -1,4 +1,4 @@ -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' // devtool imports import { TanStackDevtools } from '@tanstack/solid-devtools' diff --git a/examples/solid/a11y-devtools/tsconfig.json b/examples/solid/a11y-devtools/tsconfig.json index a0784796d..fb4a478d4 100644 --- a/examples/solid/a11y-devtools/tsconfig.json +++ b/examples/solid/a11y-devtools/tsconfig.json @@ -12,7 +12,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/examples/solid/a11y-devtools/vite.config.ts b/examples/solid/a11y-devtools/vite.config.ts index e056569e6..f7fd3814e 100644 --- a/examples/solid/a11y-devtools/vite.config.ts +++ b/examples/solid/a11y-devtools/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'vite' -import solid from 'vite-plugin-solid' +import solid from '@solidjs/vite-plugin' import { devtools } from '@tanstack/devtools-vite' // https://vite.dev/config/ export default defineConfig({ diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index abfb84893..93fc0a083 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -9,18 +9,19 @@ "test:types": "tsc" }, "dependencies": { + "@solidjs/web": "^2.0.0-rc.21", "@tanstack/solid-devtools": "^0.8.14", - "@tanstack/solid-query": "^5.90.1", - "@tanstack/solid-query-devtools": "^5.90.1", - "@tanstack/solid-router": "^1.131.50", - "@tanstack/solid-router-devtools": "^1.131.50", - "solid-js": "^1.9.13" + "@tanstack/solid-query": "^6.0.0-rc.5", + "@tanstack/solid-query-devtools": "^6.0.0-rc.5", + "@tanstack/solid-router": "^2.0.0-rc.10", + "@tanstack/solid-router-devtools": "^2.0.0-rc.8", + "solid-js": "^2.0.0-rc.21" }, "devDependencies": { + "@solidjs/vite-plugin": "^3.0.0-next.57", "@tanstack/devtools-vite": "0.8.6", "vite": "^8.0.0", - "vite-plugin-inspect": "11.3.3", - "vite-plugin-solid": "^2.11.11" + "vite-plugin-inspect": "11.3.3" }, "browserslist": { "production": [ diff --git a/examples/solid/basic/src/index.tsx b/examples/solid/basic/src/index.tsx index 58b08c419..6f5d6f571 100644 --- a/examples/solid/basic/src/index.tsx +++ b/examples/solid/basic/src/index.tsx @@ -1,4 +1,4 @@ -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' // query imports import { QueryClient, QueryClientProvider } from '@tanstack/solid-query' diff --git a/examples/solid/basic/tsconfig.json b/examples/solid/basic/tsconfig.json index a0784796d..fb4a478d4 100644 --- a/examples/solid/basic/tsconfig.json +++ b/examples/solid/basic/tsconfig.json @@ -12,7 +12,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/examples/solid/basic/vite.config.ts b/examples/solid/basic/vite.config.ts index e056569e6..f7fd3814e 100644 --- a/examples/solid/basic/vite.config.ts +++ b/examples/solid/basic/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'vite' -import solid from 'vite-plugin-solid' +import solid from '@solidjs/vite-plugin' import { devtools } from '@tanstack/devtools-vite' // https://vite.dev/config/ export default defineConfig({ diff --git a/examples/solid/devtools-ui/package.json b/examples/solid/devtools-ui/package.json index c32309c32..e19dd5798 100644 --- a/examples/solid/devtools-ui/package.json +++ b/examples/solid/devtools-ui/package.json @@ -9,15 +9,16 @@ "test:types": "tsc" }, "dependencies": { + "@solidjs/web": "^2.0.0-rc.21", "@tanstack/devtools-ui": "0.7.2", "@tanstack/solid-devtools": "^0.8.14", - "solid-js": "^1.9.13" + "solid-js": "^2.0.0-rc.21" }, "devDependencies": { + "@solidjs/vite-plugin": "^3.0.0-next.57", "@tanstack/devtools-vite": "0.8.6", "vite": "^8.0.0", - "vite-plugin-inspect": "11.3.3", - "vite-plugin-solid": "^2.11.11" + "vite-plugin-inspect": "11.3.3" }, "browserslist": { "production": [ diff --git a/examples/solid/devtools-ui/src/index.tsx b/examples/solid/devtools-ui/src/index.tsx index de6e3ac36..66568c0f9 100644 --- a/examples/solid/devtools-ui/src/index.tsx +++ b/examples/solid/devtools-ui/src/index.tsx @@ -1,5 +1,5 @@ import { createEffect, createSignal } from 'solid-js' -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { JsonTree, ThemeContextProvider } from '@tanstack/devtools-ui' import type { TanStackDevtoolsTheme } from '@tanstack/devtools-ui' @@ -25,8 +25,8 @@ function App() { darkThemeMq.matches ? 'dark' : 'light', ) - createEffect(() => { - document.documentElement.setAttribute('data-theme', theme()) + createEffect(theme, (value) => { + document.documentElement.setAttribute('data-theme', value) }) const toggleTheme = () => { diff --git a/examples/solid/devtools-ui/tsconfig.json b/examples/solid/devtools-ui/tsconfig.json index a0784796d..fb4a478d4 100644 --- a/examples/solid/devtools-ui/tsconfig.json +++ b/examples/solid/devtools-ui/tsconfig.json @@ -12,7 +12,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/examples/solid/devtools-ui/vite.config.ts b/examples/solid/devtools-ui/vite.config.ts index e056569e6..f7fd3814e 100644 --- a/examples/solid/devtools-ui/vite.config.ts +++ b/examples/solid/devtools-ui/vite.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from 'vite' -import solid from 'vite-plugin-solid' +import solid from '@solidjs/vite-plugin' import { devtools } from '@tanstack/devtools-vite' // https://vite.dev/config/ export default defineConfig({ diff --git a/knip.json b/knip.json index e29190819..d06c33691 100644 --- a/knip.json +++ b/knip.json @@ -7,11 +7,10 @@ "entry": ["scripts/generate-docs.ts", "scripts/verify-links.ts"] }, "packages/devtools-a11y": { - "ignoreDependencies": ["solid-js", "@angular/core"] + "ignoreDependencies": ["@angular/core"] }, - "packages/devtools-utils": { - "ignoreDependencies": ["react", "solid-js", "svelte", "@types/react"], + "ignoreDependencies": ["react", "svelte", "@types/react"], "entry": [ "**/vite.config.solid.ts", "**/src/solid/**", @@ -28,9 +27,6 @@ "packages/devtools-ui": { "entry": ["**/tests/**/*.ts"] }, - "packages/solid-devtools": { - "ignore": ["**/core.tsx"] - }, "packages/angular-devtools": { "ignoreDependencies": ["tslib"], "entry": ["provider/**/*.ts", "src/**/*.ts"] diff --git a/package.json b/package.json index 9336392f6..34f07fb72 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "size-limit": [ { "path": "packages/devtools/dist/index.js", - "limit": "67 KB" + "limit": "85 KB" }, { "path": "packages/event-bus-client/dist/esm/plugin.js", @@ -67,10 +67,13 @@ } ], "devDependencies": { + "@babel/core": "^7.28.0", + "@babel/preset-typescript": "^7.27.1", "@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", + "@solidjs/babel-plugin": "^2.0.0-rc.21", "@tanstack/eslint-config": "0.3.2", "@tanstack/intent": "^0.0.14", "@tanstack/typedoc-config": "0.3.3", @@ -90,6 +93,7 @@ "sherif": "^1.7.0", "size-limit": "^11.2.0", "tinyglobby": "^0.2.15", + "tsup": "^8.5.0", "typescript": "~5.9.2", "vite": "^8.0.0", "vitest": "^4.1.10" diff --git a/packages/devtools-a11y/package.json b/packages/devtools-a11y/package.json index 325fcedc4..364622fef 100644 --- a/packages/devtools-a11y/package.json +++ b/packages/devtools-a11y/package.json @@ -96,21 +96,22 @@ "build": "vite build" }, "dependencies": { + "@solidjs/web": "^2.0.0-rc.21", "@tanstack/devtools-ui": "workspace:*", "@tanstack/devtools-utils": "workspace:^", "axe-core": "^4.10.0", - "goober": "^2.1.16" + "goober": "^2.1.16", + "solid-js": "^2.0.0-rc.21" }, "devDependencies": { - "preact": "^11.0.1", - "vite-plugin-solid": "^2.11.11" + "@solidjs/vite-plugin": "^3.0.0-next.57", + "preact": "^11.0.1" }, "peerDependencies": { "@angular/core": ">=19.0.0", "@types/react": ">=17.0.0", "preact": ">=10.0.0", "react": ">=17.0.0", - "solid-js": "^1.9.13", "vue": ">=3.2.0" }, "peerDependenciesMeta": { @@ -120,9 +121,6 @@ "react": { "optional": true }, - "solid-js": { - "optional": true - }, "vue": { "optional": true }, diff --git a/packages/devtools-a11y/src/core/components/IssueCard.tsx b/packages/devtools-a11y/src/core/components/IssueCard.tsx index a7fe1da58..3d7cb2199 100644 --- a/packages/devtools-a11y/src/core/components/IssueCard.tsx +++ b/packages/devtools-a11y/src/core/components/IssueCard.tsx @@ -1,4 +1,4 @@ -/** @jsxImportSource solid-js */ +/** @jsxImportSource @solidjs/web */ import { For, Show } from 'solid-js' import { Button, createTheme } from '@tanstack/devtools-ui' @@ -24,10 +24,12 @@ export function A11yIssueCard(props: A11yIssueCardProps) { return (
@@ -35,11 +37,13 @@ export function A11yIssueCard(props: A11yIssueCardProps) { @@ -110,10 +118,9 @@ export function A11ySettingsOverlay(props: A11ySettingsOverlayProps) { variant="danger" outline onClick={() => - setConfig( - 'disabledRules', - availableRules().map((rule) => rule.id), - ) + setConfig((c) => { + c.disabledRules = availableRules().map((rule) => rule.id) + }) } > Disable All @@ -160,11 +167,13 @@ export function A11ySettingsOverlay(props: A11ySettingsOverlayProps) {