Skip to content

Commit

Permalink
Merge pull request #3872 from dequelabs/release-4.6.3
Browse files Browse the repository at this point in the history
chore(release): 4.6.3
  • Loading branch information
WilcoFiers committed Jan 23, 2023
2 parents 98844fb + a5ac9b5 commit fddc1cd
Show file tree
Hide file tree
Showing 47 changed files with 1,824 additions and 1,275 deletions.
124 changes: 85 additions & 39 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,56 @@ set_npm_auth: &set_npm_auth

restore_dependency_cache_unix: &restore_dependency_cache_unix
restore_cache:
name: Restore NPM Cache
keys:
- v9-cache-unix-{{ checksum "package-lock.json" }}
- v9-cache-unix-

restore_build: &restore_build
restore_cache:
name: Restore Axe.js Cache
keys:
- v9-cache-build-<< pipeline.git.revision >>

jobs:
# Fetch and cache dependencies.
dependencies_unix:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- <<: *set_npm_auth
- <<: *restore_dependency_cache_unix
- run:
name: Skip Install If Cache Exists
command: |
if [ -d "node_modules" ]; then
echo "node_modules exist"
circleci step halt
else
echo "node_modules does not exist"
fi
- browser-tools/install-browser-tools
- <<: *set_npm_auth
- run: npm ci
- run: npx browser-driver-manager install chromedriver --verbose
- save_cache:
key: v9-cache-unix-{{ checksum "package-lock.json" }}
paths:
- node_modules

# Build and cache axe.js
build_unix:
<<: *defaults
<<: *unix_box
steps:
- checkout
- <<: *restore_dependency_cache_unix
- run: npm run build
- save_cache:
key: v9-cache-build-<< pipeline.git.revision >>
paths:
- axe.js
- axe.min.js

# Run ESLINT
lint:
<<: *defaults
Expand All @@ -55,22 +84,22 @@ jobs:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- browser-tools/install-browser-tools
- <<: *restore_dependency_cache_unix
- run: npx browser-driver-manager install chromedriver --verbose
- run: npm run build
- <<: *restore_build
- run: npm run test -- --browsers Chrome
- run: npm run test:integration:chrome

test_firefox:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- browser-tools/install-browser-tools
- <<: *restore_dependency_cache_unix
- run: npm run build
- <<: *restore_build
- run: npm run test -- --browsers Firefox
- run: npm run test:integration:firefox

Expand All @@ -79,59 +108,59 @@ jobs:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- browser-tools/install-browser-tools
- <<: *restore_dependency_cache_unix
- run: npx browser-driver-manager install chromedriver --verbose
- run: npm run build
- <<: *restore_build
- run: npm run test:examples

# Run ACT test cases
test_act:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- browser-tools/install-browser-tools
- <<: *restore_dependency_cache_unix
- run: npx browser-driver-manager install chromedriver --verbose
- run: npm run build
- <<: *restore_build
- run: npm run test:act

# Run ARIA practices test cases
test_aria_practices:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- browser-tools/install-browser-tools
- <<: *restore_dependency_cache_unix
- run: npx browser-driver-manager install chromedriver --verbose
- run: npm run build
- <<: *restore_build
- run: npm run test:apg

# Test locale files
test_locales:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- browser-tools/install-browser-tools
- <<: *restore_dependency_cache_unix
- run: npx browser-driver-manager install chromedriver --verbose
- run: npm run build
- <<: *restore_build
- run: npm run test:locales

# Test virtual rules
test_virtual_rules:
<<: *defaults
<<: *unix_box
steps:
- browser-tools/install-browser-tools
- checkout
- browser-tools/install-browser-tools
- <<: *restore_dependency_cache_unix
- run: npx browser-driver-manager install chromedriver --verbose
- run: npm run build
- <<: *restore_build
- run: npm run test:virtual-rules

# Run the test suite for nightly builds.
Expand All @@ -142,7 +171,7 @@ jobs:
- checkout
- <<: *restore_dependency_cache_unix
- run: sudo apt-get update -y
- run: npm run build
- <<: *restore_build
- run:
name: Install Chrome and ChromeDriver Beta
command: npx browser-driver-manager install chrome=beta chromedriver=beta --verbose
Expand All @@ -169,7 +198,7 @@ jobs:
# also re-installs all repo dependencies as well
- run: npm install w3c/wcag-act-rules#main
- run: npx browser-driver-manager install chromedriver --verbose
- run: npm run build
- <<: *restore_build
- run: npm run test:act

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

# Test api docs can be built
Expand Down Expand Up @@ -214,7 +243,7 @@ jobs:
steps:
- checkout
- <<: *restore_dependency_cache_unix
- run: npm run build
- <<: *restore_build
- run: npm run test:node

# Release a "next" version
Expand All @@ -225,21 +254,30 @@ jobs:
- checkout
- <<: *set_npm_auth
- <<: *restore_dependency_cache_unix
- run: npm run build
- <<: *restore_build
- run: npm run next-release
- run: .circleci/verify-release.sh
- run: npm publish --tag=next

# Release a "production" version
release:
verify_sri:
<<: *defaults
<<: *unix_box
steps:
- checkout
- <<: *set_npm_auth
- <<: *restore_dependency_cache_unix
- run: npm run build
- <<: *restore_build
- run: npm run sri-validate

# Release a "production" version
release:
<<: *defaults
<<: *unix_box
steps:
- checkout
- <<: *set_npm_auth
- <<: *restore_dependency_cache_unix
- run: .circleci/verify-release.sh
- run: npm publish

Expand Down Expand Up @@ -282,10 +320,13 @@ workflows:
jobs:
# install deps
- dependencies_unix
- build_unix:
requires:
- dependencies_unix
# Run linting
- lint:
requires:
- dependencies_unix
- build_unix
# Run tests on all commits, but after installing dependencies
- test_chrome:
requires:
Expand Down Expand Up @@ -317,47 +358,52 @@ workflows:
- test_node:
requires:
- test_chrome
# Verify the sri history is correct
- verify_sri:
requires:
- dependencies_unix
filters:
branches:
only:
- /release-*/
- master
# Hold for approval
- hold:
- hold_release:
type: approval
requires:
- test_chrome
- test_firefox
- test_examples
- test_act
- test_aria_practices
- test_locales
- test_virtual_rules
- build_api_docs
- test_rule_help_version
- test_node
- verify_sri
filters:
branches:
only:
- master
# Run a next release on "develop" commits, but only after the tests pass and dependencies are installed
- next_release:
requires:
- dependencies_unix
- test_chrome
- test_firefox
- test_examples
- test_act
- test_aria_practices
- test_locales
- test_virtual_rules
- build_api_docs
- test_rule_help_version
- test_node
filters:
branches:
only: develop
# Run a production release on "master" commits, but only after the tests pass and dependencies are installed
- release:
requires:
- dependencies_unix
- test_chrome
- test_firefox
- test_examples
- test_locales
- test_virtual_rules
- build_api_docs
- test_rule_help_version
- test_node
- hold
- hold_release
filters:
branches:
only: master
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

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.

### [4.6.3](https://github.com/dequelabs/axe-core/compare/v4.6.2...v4.6.3) (2023-01-23)

### Bug Fixes

- **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))
- **autocomplete-valid:** allow webauthn token ([#3866](https://github.com/dequelabs/axe-core/issues/3866)) ([a3d1b9d](https://github.com/dequelabs/axe-core/commit/a3d1b9dae840e1c6ad096895bbd3bbc19f6836f8))
- **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))
- **color-contrast:** skip ligature icons ([#3867](https://github.com/dequelabs/axe-core/issues/3867)) ([7dfbd9a](https://github.com/dequelabs/axe-core/commit/7dfbd9a1b2c92a8aa289f42635ec93de9aa32d25))
- **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))
- **scrollable-region-focusable:** skip native controls ([#3862](https://github.com/dequelabs/axe-core/issues/3862)) ([aaf44e9](https://github.com/dequelabs/axe-core/commit/aaf44e908337cbf81c97433f58ec05cd3b3eeded))

### [4.6.2](https://github.com/dequelabs/axe-core/compare/v4.6.1...v4.6.2) (2022-12-23)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,6 @@ Read the [documentation on contributing](CONTRIBUTING.md)

## Acknowledgements

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.
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.

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.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "axe-core",
"version": "4.6.2",
"version": "4.6.3",
"contributors": [
{
"name": "David Sturley",
Expand Down
10 changes: 10 additions & 0 deletions doc/check-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
- [region](#region)
- [inline-style-property](#inline-style-property)
- [invalid-children](#invalid-children)
- [link-in-text-block](#link-in-text-block)

## How Checks Work

Expand Down Expand Up @@ -538,3 +539,12 @@ This evaluation method is used in the `list` and `definition-list` rule to deter
| `validNodeNames` | Nodes without role allowed as children |
| `validRoles` | Roles allowed on child elements |
| `divGroups` | Whether the child nodes can be grouped in a div without any role (false by default) |

### link-in-text-block

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.

| Option | Default | Description |
| ----------------------- | :------ | :-------------------------------------------------------------------------- |
| `requiredContrastRatio` | `3` | Minimum contrast needed to pass the check between text or background colors |
| `allowSameColor` | `true` | Whether links with colors identical to its surroundings should pass |
1 change: 0 additions & 1 deletion doc/examples/chrome-debugging-protocol/.npmrc

This file was deleted.

6 changes: 3 additions & 3 deletions doc/examples/chrome-debugging-protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"scripts": {
"test": "echo 'No test specified.'"
},
"dependencies": {
"axe-core": "^3.3.1",
"chrome-remote-interface": "^0.27.1"
"devDependencies": {
"axe-core": "^4.6.2",
"chrome-remote-interface": "^0.31.3"
}
}
9 changes: 4 additions & 5 deletions doc/examples/jasmine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
"organization": "Deque Systems, Inc.",
"url": "http://deque.com/"
},
"dependencies": {},
"scripts": {
"test": "karma start karma.conf.js"
},
"devDependencies": {
"axe-core": "^3.3.1",
"karma": "^4.2.0",
"karma-chrome-launcher": "^3.0.0",
"karma-jasmine": "^2.0.1"
"axe-core": "^4.6.2",
"karma": "^6.4.1",
"karma-chrome-launcher": "^3.1.1",
"karma-jasmine": "^5.1.0"
}
}
Loading

0 comments on commit fddc1cd

Please sign in to comment.