Skip to content

Commit

Permalink
Merge pull request #407 from dequelabs/master-merge-conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-siek committed Nov 30, 2021
2 parents be3912d + 2a93b8d commit 0372686
Show file tree
Hide file tree
Showing 17 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packages": ["packages/*", "packages/react/examples/*", "axe_core_test"],
"version": "4.3.1"
"version": "4.3.2"
}
14 changes: 7 additions & 7 deletions packages/cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/cli",
"version": "4.3.1",
"version": "4.3.2",
"description": "A CLI for accessibility testing using axe-core",
"author": {
"name": "Wilco Fiers",
Expand Down Expand Up @@ -44,9 +44,9 @@
"testing"
],
"dependencies": {
"@axe-core/webdriverjs": "^4.3.1",
"@axe-core/webdriverjs": "^4.3.2",
"axe-core": "^4.3.5",
"chromedriver": "^95.0.0",
"chromedriver": "^96.0.0",
"colors": "^1.4.0",
"commander": "^7.1.0",
"selenium-webdriver": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/playwright/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/playwright/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/playwright",
"version": "4.3.1",
"version": "4.3.2",
"description": "Provides a method to inject and analyze web pages using axe",
"contributors": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/puppeteer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/puppeteer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/puppeteer",
"version": "4.3.1",
"version": "4.3.2",
"description": "Provides a chainable axe API for Puppeteer and automatically injects into all frames",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/examples/shadow-dom/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/react/examples/shadow-dom/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/react-example",
"version": "4.3.1",
"version": "4.3.2",
"description": "Example of react-axe with a React.js application",
"main": "index.js",
"private": true,
Expand All @@ -13,7 +13,7 @@
"author": "Dylan Barrell (dylan@barrell.com)",
"license": "MIT",
"dependencies": {
"@axe-core/react": "^4.3.1",
"@axe-core/react": "^4.3.2",
"create-react-class": "^15.6.3",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/react",
"version": "4.3.1",
"version": "4.3.2",
"description": "Dynamic accessibility analysis for React using axe-core",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/reporter-earl/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/reporter-earl/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/reporter-earl",
"version": "4.3.1",
"version": "4.3.2",
"description": "A EARL+JSON-LD reporter for axe-core",
"main": "dist/axeReporterEarl.js",
"scripts": {
Expand Down
20 changes: 10 additions & 10 deletions packages/webdriverio/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/webdriverio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/webdriverio",
"version": "4.3.1",
"version": "4.3.2",
"description": "Provides a method to inject and analyze web pages using axe",
"contributors": [
{
Expand Down Expand Up @@ -47,7 +47,7 @@
"@wdio/sync": "^7.16.3",
"axe-test-fixtures": "github:dequelabs/axe-test-fixtures#v1",
"chai": "^4.3.0",
"chromedriver": "^95.0.0",
"chromedriver": "^96.0.0",
"delay": "^5.0.0",
"express": "^4.17.1",
"mocha": "^8.4.0",
Expand Down
32 changes: 16 additions & 16 deletions packages/webdriverjs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/webdriverjs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@axe-core/webdriverjs",
"version": "4.3.1",
"version": "4.3.2",
"description": "Provides a method to inject and analyze web pages using axe",
"contributors": [
{
Expand Down Expand Up @@ -66,7 +66,7 @@
"axe-test-fixtures": "github:dequelabs/axe-test-fixtures#v1",
"chai": "^4.3.0",
"chaimocha": "^1.10.0",
"chromedriver": "^95.0.0",
"chromedriver": "^96.0.0",
"delay": "^5.0.0",
"express": "^4.17.1",
"http-server": "^0.12.3",
Expand Down

0 comments on commit 0372686

Please sign in to comment.