chore: Update from master (#1414)

dequelabs · Mar 6, 2019 · 1da0eb8 · 1da0eb8
1 parent 594f91e
commit 1da0eb8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 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.
 
+## [3.2.1](https://github.com/dequelabs/axe-core/compare/v3.2.0...v3.2.1) (2019-03-06)
+
+### Bug Fixes
+
+- Avoid require conflict with Cypress [[#1405](https://github.com/dequelabs/axe-core/issues/1405)](<[#1406](https://github.com/dequelabs/axe-core/issues/1406)>) ([30aa570](https://github.com/dequelabs/axe-core/commit/30aa570))
+
 # [3.2.0](https://github.com/dequelabs/axe-core/compare/v3.0.3...v3.2.0) (2019-03-04)
 
 ### Bug Fixes

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "axe-core",
-	"version": "3.2.0",
+	"version": "3.2.1",
 	"contributors": [
 		{
 			"name": "David Sturley",
@@ -35,12 +35,6 @@
 	"main": "axe.js",
 	"typings": "axe.d.ts",
 	"license": "MPL-2.0",
-	"ignore": [
-		"**/.*",
-		"node_modules",
-		"test",
-		"build",
-		"typings"
-	],
+	"ignore": ["**/.*", "node_modules", "test", "build", "typings"],
 	"devDependencies": {}
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "axe-core",
 	"description": "Accessibility engine for automated Web UI testing",
-	"version": "3.2.0",
+	"version": "3.2.1",
 	"license": "MPL-2.0",
 	"engines": {
 		"node": ">=4"

diff --git a/sri-history.json b/sri-history.json
@@ -126,5 +126,9 @@
 	"3.2.0": {
 		"axe.js": "sha256-wdCvSfDepBhwcvTqB0gm586ywpla6Yi81qLCHjegILM=",
 		"axe.min.js": "sha256-Tvf4toyAt1NFmmkuLsgStXW+4pcG5GG9ugopPoOvOwg="
+	},
+	"3.2.1": {
+		"axe.js": "sha256-VPX1ngRx0XWqC5BP9XdHoDd8YlbgXGK39cz14GBL9bg=",
+		"axe.min.js": "sha256-ynN9JxvxoI9VpL7IbdTVCUCLhy3N7Ygrnit2r7a2vK8="
 	}
-}
+}