Skip to content

Commit 533d3fb

Browse files
committed
Merge remote-tracking branch 'origin/a11y' into a11y
# Conflicts: # packages/devtools-a11y/vite.config.ts
2 parents 4ca09bc + 5ac416d commit 533d3fb

File tree

21 files changed

+172
-135
lines changed

21 files changed

+172
-135
lines changed

examples/react/a11y-devtools/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "tsc"
1010
},
1111
"dependencies": {
12-
"@tanstack/devtools-a11y": "workspace:*",
13-
"@tanstack/react-devtools": "workspace:*",
12+
"@tanstack/devtools-a11y": "^0.0.1",
13+
"@tanstack/react-devtools": "^0.9.3",
1414
"react": "^19.2.0",
1515
"react-dom": "^19.2.0"
1616
},

examples/react/basic/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"@tanstack/react-query-devtools": "^5.90.1",
1818
"@tanstack/react-router": "^1.132.0",
1919
"@tanstack/react-router-devtools": "^1.132.0",
20-
"@tanstack/devtools-a11y": "workspace:*",
2120
"react": "^19.2.0",
2221
"react-dom": "^19.2.0",
2322
"zod": "^4.3.5"

examples/react/basic/src/setup.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { ReactQueryDevtoolsPanel } from '@tanstack/react-query-devtools'
22
import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
3-
import { createA11yDevtoolsReactPlugin } from '@tanstack/devtools-a11y/react'
43

54
import {
65
Link,
@@ -80,7 +79,7 @@ export default function DevtoolsExample() {
8079
name: 'Package.json',
8180
render: () => <PackageJsonPanel />,
8281
},
83-
createA11yDevtoolsReactPlugin({ runOnMount: false })[0](),
82+
8483
/* {
8584
name: "The actual app",
8685
render: <iframe style={{ width: '100%', height: '100%' }} src="http://localhost:3005" />,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "configPath": "..\\..\\dist\\server\\wrangler.json", "auxiliaryWorkers": [] }
1+
{ "configPath": "../../dist/server/wrangler.json", "auxiliaryWorkers": [] }

knip.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,24 @@
33
"ignoreDependencies": ["@faker-js/faker"],
44
"ignoreWorkspaces": ["examples/**"],
55
"workspaces": {
6+
"packages/devtools-a11y": {
7+
"entry": [
8+
"vite.config.react.ts",
9+
"vite.config.solid.ts",
10+
"src/core/production.ts",
11+
"src/react/index.ts",
12+
"src/react/production.ts",
13+
"src/solid/index.ts",
14+
"src/solid/production.ts"
15+
]
16+
},
17+
618
"packages/devtools-utils": {
719
"ignoreDependencies": ["react", "solid-js", "@types/react"],
820
"entry": ["**/vite.config.solid.ts", "**/src/solid/**"],
921
"project": ["**/vite.config.solid.ts", "**/src/solid/**"]
1022
},
23+
1124
"packages/solid-devtools": {
1225
"ignore": ["**/core.tsx"]
1326
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// @ts-check
2+
3+
import rootConfig from '../../eslint.config.js'
4+
5+
export default [
6+
...rootConfig,
7+
{
8+
rules: {},
9+
},
10+
]

packages/devtools-a11y/package.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,38 +23,41 @@
2323
"audit"
2424
],
2525
"type": "module",
26-
"types": "dist/esm/index.d.ts",
27-
"main": "dist/cjs/index.cjs",
28-
"module": "dist/esm/index.js",
2926
"exports": {
30-
".": {
27+
"./core": {
3128
"import": {
32-
"types": "./dist/esm/index.d.ts",
33-
"default": "./dist/esm/index.js"
34-
},
35-
"require": {
36-
"types": "./dist/cjs/index.d.cts",
37-
"default": "./dist/cjs/index.cjs"
29+
"types": "./dist/core/esm/index.d.ts",
30+
"default": "./dist/core/esm/index.js"
31+
}
32+
},
33+
"./core/production": {
34+
"import": {
35+
"types": "./dist/core/esm/production.d.ts",
36+
"default": "./dist/core/esm/production.js"
3837
}
3938
},
4039
"./react": {
4140
"import": {
42-
"types": "./dist/esm/react/index.d.ts",
43-
"default": "./dist/esm/react/index.js"
44-
},
45-
"require": {
46-
"types": "./dist/cjs/react/index.d.cts",
47-
"default": "./dist/cjs/react/index.cjs"
41+
"types": "./dist/react/esm/index.d.ts",
42+
"default": "./dist/react/esm/react/index.js"
43+
}
44+
},
45+
"./react/production": {
46+
"import": {
47+
"types": "./dist/react/esm/production.d.ts",
48+
"default": "./dist/react/esm/react/production.js"
4849
}
4950
},
5051
"./solid": {
5152
"import": {
52-
"types": "./dist/esm/solid/index.d.ts",
53-
"default": "./dist/esm/solid/index.js"
54-
},
55-
"require": {
56-
"types": "./dist/cjs/solid/index.d.cts",
57-
"default": "./dist/cjs/solid/index.cjs"
53+
"types": "./dist/solid/esm/index.d.ts",
54+
"default": "./dist/solid/esm/solid/index.js"
55+
}
56+
},
57+
"./solid/production": {
58+
"import": {
59+
"types": "./dist/solid/esm/production.d.ts",
60+
"default": "./dist/solid/esm/solid/production.js"
5861
}
5962
},
6063
"./package.json": "./package.json"
@@ -75,10 +78,9 @@
7578
"test:lib:dev": "pnpm test:lib --watch",
7679
"test:types": "tsc",
7780
"test:build": "publint --strict",
78-
"build": "vite build"
81+
"build": "vite build && vite build --config vite.config.react.ts && vite build --config vite.config.solid.ts"
7982
},
8083
"dependencies": {
81-
"@tanstack/devtools-event-client": "workspace:*",
8284
"@tanstack/devtools-ui": "workspace:*",
8385
"@tanstack/devtools-utils": "workspace:^",
8486
"axe-core": "^4.10.0",

packages/devtools-a11y/src/core/components/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/** @jsxImportSource solid-js */
2+
13
import { AllyProvider } from '../contexts/allyContext'
24
import { Shell } from './Shell'
35

packages/devtools-a11y/src/core/contexts/allyContext.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/** @jsxImportSource solid-js */
2+
13
import {
24
createContext,
35
createEffect,
@@ -6,7 +8,7 @@ import {
68
useContext,
79
} from 'solid-js'
810
import { createStore } from 'solid-js/store'
9-
import { runAudit } from '../utils/ally-audit.utils'
11+
import { filterIssuesAboveThreshold, runAudit } from '../utils/ally-audit.utils'
1012
import { mergeConfig, saveConfig } from '../utils/config.utils'
1113
import { clearHighlights, highlightAllIssues } from '../utils/ui.utils'
1214

@@ -43,6 +45,8 @@ function useAllyValue() {
4345
if (allyResult.state !== 'done' || !allyResult.audit?.issues) return []
4446
let results = allyResult.audit.issues
4547

48+
results = filterIssuesAboveThreshold(results, config.threshold)
49+
4650
// removes excluded rules
4751
if (config.disabledRules.length > 0) {
4852
results = results.filter(

packages/devtools-a11y/src/core/core.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/** @jsxImportSource solid-js */
2+
13
import { lazy } from 'solid-js'
24
import { constructCoreClass } from '@tanstack/devtools-utils/solid'
35

0 commit comments

Comments
 (0)