Skip to content

Commit fddc1cd

Browse files
authored
Merge pull request #3872 from dequelabs/release-4.6.3
chore(release): 4.6.3
2 parents 98844fb + a5ac9b5 commit fddc1cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1824
-1275
lines changed

.circleci/config.yml

Lines changed: 85 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,56 @@ set_npm_auth: &set_npm_auth
2020

2121
restore_dependency_cache_unix: &restore_dependency_cache_unix
2222
restore_cache:
23+
name: Restore NPM Cache
2324
keys:
2425
- v9-cache-unix-{{ checksum "package-lock.json" }}
25-
- v9-cache-unix-
26+
27+
restore_build: &restore_build
28+
restore_cache:
29+
name: Restore Axe.js Cache
30+
keys:
31+
- v9-cache-build-<< pipeline.git.revision >>
2632

2733
jobs:
2834
# Fetch and cache dependencies.
2935
dependencies_unix:
3036
<<: *defaults
3137
<<: *unix_box
3238
steps:
33-
- browser-tools/install-browser-tools
3439
- checkout
35-
- <<: *set_npm_auth
3640
- <<: *restore_dependency_cache_unix
41+
- run:
42+
name: Skip Install If Cache Exists
43+
command: |
44+
if [ -d "node_modules" ]; then
45+
echo "node_modules exist"
46+
circleci step halt
47+
else
48+
echo "node_modules does not exist"
49+
fi
50+
- browser-tools/install-browser-tools
51+
- <<: *set_npm_auth
3752
- run: npm ci
3853
- run: npx browser-driver-manager install chromedriver --verbose
3954
- save_cache:
4055
key: v9-cache-unix-{{ checksum "package-lock.json" }}
4156
paths:
4257
- node_modules
4358

59+
# Build and cache axe.js
60+
build_unix:
61+
<<: *defaults
62+
<<: *unix_box
63+
steps:
64+
- checkout
65+
- <<: *restore_dependency_cache_unix
66+
- run: npm run build
67+
- save_cache:
68+
key: v9-cache-build-<< pipeline.git.revision >>
69+
paths:
70+
- axe.js
71+
- axe.min.js
72+
4473
# Run ESLINT
4574
lint:
4675
<<: *defaults
@@ -55,22 +84,22 @@ jobs:
5584
<<: *defaults
5685
<<: *unix_box
5786
steps:
58-
- browser-tools/install-browser-tools
5987
- checkout
88+
- browser-tools/install-browser-tools
6089
- <<: *restore_dependency_cache_unix
6190
- run: npx browser-driver-manager install chromedriver --verbose
62-
- run: npm run build
91+
- <<: *restore_build
6392
- run: npm run test -- --browsers Chrome
6493
- run: npm run test:integration:chrome
6594

6695
test_firefox:
6796
<<: *defaults
6897
<<: *unix_box
6998
steps:
70-
- browser-tools/install-browser-tools
7199
- checkout
100+
- browser-tools/install-browser-tools
72101
- <<: *restore_dependency_cache_unix
73-
- run: npm run build
102+
- <<: *restore_build
74103
- run: npm run test -- --browsers Firefox
75104
- run: npm run test:integration:firefox
76105

@@ -79,59 +108,59 @@ jobs:
79108
<<: *defaults
80109
<<: *unix_box
81110
steps:
82-
- browser-tools/install-browser-tools
83111
- checkout
112+
- browser-tools/install-browser-tools
84113
- <<: *restore_dependency_cache_unix
85114
- run: npx browser-driver-manager install chromedriver --verbose
86-
- run: npm run build
115+
- <<: *restore_build
87116
- run: npm run test:examples
88117

89118
# Run ACT test cases
90119
test_act:
91120
<<: *defaults
92121
<<: *unix_box
93122
steps:
94-
- browser-tools/install-browser-tools
95123
- checkout
124+
- browser-tools/install-browser-tools
96125
- <<: *restore_dependency_cache_unix
97126
- run: npx browser-driver-manager install chromedriver --verbose
98-
- run: npm run build
127+
- <<: *restore_build
99128
- run: npm run test:act
100129

101130
# Run ARIA practices test cases
102131
test_aria_practices:
103132
<<: *defaults
104133
<<: *unix_box
105134
steps:
106-
- browser-tools/install-browser-tools
107135
- checkout
136+
- browser-tools/install-browser-tools
108137
- <<: *restore_dependency_cache_unix
109138
- run: npx browser-driver-manager install chromedriver --verbose
110-
- run: npm run build
139+
- <<: *restore_build
111140
- run: npm run test:apg
112141

113142
# Test locale files
114143
test_locales:
115144
<<: *defaults
116145
<<: *unix_box
117146
steps:
118-
- browser-tools/install-browser-tools
119147
- checkout
148+
- browser-tools/install-browser-tools
120149
- <<: *restore_dependency_cache_unix
121150
- run: npx browser-driver-manager install chromedriver --verbose
122-
- run: npm run build
151+
- <<: *restore_build
123152
- run: npm run test:locales
124153

125154
# Test virtual rules
126155
test_virtual_rules:
127156
<<: *defaults
128157
<<: *unix_box
129158
steps:
130-
- browser-tools/install-browser-tools
131159
- checkout
160+
- browser-tools/install-browser-tools
132161
- <<: *restore_dependency_cache_unix
133162
- run: npx browser-driver-manager install chromedriver --verbose
134-
- run: npm run build
163+
- <<: *restore_build
135164
- run: npm run test:virtual-rules
136165

137166
# Run the test suite for nightly builds.
@@ -142,7 +171,7 @@ jobs:
142171
- checkout
143172
- <<: *restore_dependency_cache_unix
144173
- run: sudo apt-get update -y
145-
- run: npm run build
174+
- <<: *restore_build
146175
- run:
147176
name: Install Chrome and ChromeDriver Beta
148177
command: npx browser-driver-manager install chrome=beta chromedriver=beta --verbose
@@ -169,7 +198,7 @@ jobs:
169198
# also re-installs all repo dependencies as well
170199
- run: npm install w3c/wcag-act-rules#main
171200
- run: npx browser-driver-manager install chromedriver --verbose
172-
- run: npm run build
201+
- <<: *restore_build
173202
- run: npm run test:act
174203

175204
# Run the test suite for nightly builds.
@@ -185,7 +214,7 @@ jobs:
185214
# also re-installs all repo dependencies as well
186215
- run: npm install w3c/aria-practices#main
187216
- run: npx browser-driver-manager install chromedriver --verbose
188-
- run: npm run build
217+
- <<: *restore_build
189218
- run: npm run test:apg
190219

191220
# Test api docs can be built
@@ -214,7 +243,7 @@ jobs:
214243
steps:
215244
- checkout
216245
- <<: *restore_dependency_cache_unix
217-
- run: npm run build
246+
- <<: *restore_build
218247
- run: npm run test:node
219248

220249
# Release a "next" version
@@ -225,21 +254,30 @@ jobs:
225254
- checkout
226255
- <<: *set_npm_auth
227256
- <<: *restore_dependency_cache_unix
228-
- run: npm run build
257+
- <<: *restore_build
229258
- run: npm run next-release
230259
- run: .circleci/verify-release.sh
231260
- run: npm publish --tag=next
232261

233262
# Release a "production" version
234-
release:
263+
verify_sri:
235264
<<: *defaults
236265
<<: *unix_box
237266
steps:
238267
- checkout
239268
- <<: *set_npm_auth
240269
- <<: *restore_dependency_cache_unix
241-
- run: npm run build
270+
- <<: *restore_build
242271
- run: npm run sri-validate
272+
273+
# Release a "production" version
274+
release:
275+
<<: *defaults
276+
<<: *unix_box
277+
steps:
278+
- checkout
279+
- <<: *set_npm_auth
280+
- <<: *restore_dependency_cache_unix
243281
- run: .circleci/verify-release.sh
244282
- run: npm publish
245283

@@ -282,10 +320,13 @@ workflows:
282320
jobs:
283321
# install deps
284322
- dependencies_unix
323+
- build_unix:
324+
requires:
325+
- dependencies_unix
285326
# Run linting
286327
- lint:
287328
requires:
288-
- dependencies_unix
329+
- build_unix
289330
# Run tests on all commits, but after installing dependencies
290331
- test_chrome:
291332
requires:
@@ -317,47 +358,52 @@ workflows:
317358
- test_node:
318359
requires:
319360
- test_chrome
361+
# Verify the sri history is correct
362+
- verify_sri:
363+
requires:
364+
- dependencies_unix
365+
filters:
366+
branches:
367+
only:
368+
- /release-*/
369+
- master
320370
# Hold for approval
321-
- hold:
371+
- hold_release:
322372
type: approval
323373
requires:
324-
- test_chrome
374+
- test_firefox
325375
- test_examples
376+
- test_act
377+
- test_aria_practices
326378
- test_locales
327379
- test_virtual_rules
328380
- build_api_docs
329381
- test_rule_help_version
330382
- test_node
383+
- verify_sri
331384
filters:
332385
branches:
333386
only:
334387
- master
335388
# Run a next release on "develop" commits, but only after the tests pass and dependencies are installed
336389
- next_release:
337390
requires:
338-
- dependencies_unix
339-
- test_chrome
340391
- test_firefox
341392
- test_examples
393+
- test_act
394+
- test_aria_practices
342395
- test_locales
343396
- test_virtual_rules
344397
- build_api_docs
398+
- test_rule_help_version
399+
- test_node
345400
filters:
346401
branches:
347402
only: develop
348403
# Run a production release on "master" commits, but only after the tests pass and dependencies are installed
349404
- release:
350405
requires:
351-
- dependencies_unix
352-
- test_chrome
353-
- test_firefox
354-
- test_examples
355-
- test_locales
356-
- test_virtual_rules
357-
- build_api_docs
358-
- test_rule_help_version
359-
- test_node
360-
- hold
406+
- hold_release
361407
filters:
362408
branches:
363409
only: master

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [4.6.3](https://github.com/dequelabs/axe-core/compare/v4.6.2...v4.6.3) (2023-01-23)
6+
7+
### Bug Fixes
8+
9+
- **aria-required-children:** allow separator in menu(bar) ([#3868](https://github.com/dequelabs/axe-core/issues/3868)) ([46c9499](https://github.com/dequelabs/axe-core/commit/46c9499ff46b2062098c33f2037ab31bff4fb656))
10+
- **autocomplete-valid:** allow webauthn token ([#3866](https://github.com/dequelabs/axe-core/issues/3866)) ([a3d1b9d](https://github.com/dequelabs/axe-core/commit/a3d1b9dae840e1c6ad096895bbd3bbc19f6836f8))
11+
- **color-contrast:** correctly compute color contrast of <slot> elements ([#3847](https://github.com/dequelabs/axe-core/issues/3847)) ([844cea1](https://github.com/dequelabs/axe-core/commit/844cea1238ccb30cc1c4d1510f2bb3d4cfbe1706))
12+
- **color-contrast:** skip ligature icons ([#3867](https://github.com/dequelabs/axe-core/issues/3867)) ([7dfbd9a](https://github.com/dequelabs/axe-core/commit/7dfbd9a1b2c92a8aa289f42635ec93de9aa32d25))
13+
- **link-in-text-block:** allow links with identical colors ([#3861](https://github.com/dequelabs/axe-core/issues/3861)) ([6761f36](https://github.com/dequelabs/axe-core/commit/6761f36bb7c9a2f05cea75ca88c8e0f199c032df))
14+
- **scrollable-region-focusable:** skip native controls ([#3862](https://github.com/dequelabs/axe-core/issues/3862)) ([aaf44e9](https://github.com/dequelabs/axe-core/commit/aaf44e908337cbf81c97433f58ec05cd3b3eeded))
15+
516
### [4.6.2](https://github.com/dequelabs/axe-core/compare/v4.6.1...v4.6.2) (2022-12-23)
617

718
### Bug Fixes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,6 @@ Read the [documentation on contributing](CONTRIBUTING.md)
177177

178178
## Acknowledgements
179179

180-
Thanks to Dulin Marat for his [css-selector-parser](https://www.npmjs.com/package/css-selector-parser) implementation which is included for shadow DOM support.
180+
Thanks to Marat Dulin for his [css-selector-parser](https://www.npmjs.com/package/css-selector-parser) implementation which is included for shadow DOM support.
181181

182182
Thanks to the [Slick Parser](https://github.com/mootools/slick/blob/master/Source/Slick.Parser.js) implementers for their contribution, we have used some of their algorithms in our shadow DOM support code.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "axe-core",
3-
"version": "4.6.2",
3+
"version": "4.6.3",
44
"contributors": [
55
{
66
"name": "David Sturley",

doc/check-options.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
- [region](#region)
3737
- [inline-style-property](#inline-style-property)
3838
- [invalid-children](#invalid-children)
39+
- [link-in-text-block](#link-in-text-block)
3940

4041
## How Checks Work
4142

@@ -538,3 +539,12 @@ This evaluation method is used in the `list` and `definition-list` rule to deter
538539
| `validNodeNames` | Nodes without role allowed as children |
539540
| `validRoles` | Roles allowed on child elements |
540541
| `divGroups` | Whether the child nodes can be grouped in a div without any role (false by default) |
542+
543+
### link-in-text-block
544+
545+
This evaluation method is used in the `link-in-text-block` rule and tests that either the foreground color or the background color has sufficient contrast between the link text and the surrounding text.
546+
547+
| Option | Default | Description |
548+
| ----------------------- | :------ | :-------------------------------------------------------------------------- |
549+
| `requiredContrastRatio` | `3` | Minimum contrast needed to pass the check between text or background colors |
550+
| `allowSameColor` | `true` | Whether links with colors identical to its surroundings should pass |

doc/examples/chrome-debugging-protocol/.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/examples/chrome-debugging-protocol/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"scripts": {
55
"test": "echo 'No test specified.'"
66
},
7-
"dependencies": {
8-
"axe-core": "^3.3.1",
9-
"chrome-remote-interface": "^0.27.1"
7+
"devDependencies": {
8+
"axe-core": "^4.6.2",
9+
"chrome-remote-interface": "^0.31.3"
1010
}
1111
}

doc/examples/jasmine/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
"organization": "Deque Systems, Inc.",
99
"url": "http://deque.com/"
1010
},
11-
"dependencies": {},
1211
"scripts": {
1312
"test": "karma start karma.conf.js"
1413
},
1514
"devDependencies": {
16-
"axe-core": "^3.3.1",
17-
"karma": "^4.2.0",
18-
"karma-chrome-launcher": "^3.0.0",
19-
"karma-jasmine": "^2.0.1"
15+
"axe-core": "^4.6.2",
16+
"karma": "^6.4.1",
17+
"karma-chrome-launcher": "^3.1.1",
18+
"karma-jasmine": "^5.1.0"
2019
}
2120
}

0 commit comments

Comments
 (0)