govuk_publishing_components 21.22.0 → 21.22.1

data/node_modules/axe-core/lib/commons/dom/shadow-elements-from-point.js

@@ -14,7 +14,8 @@ dom.shadowElementsFromPoint = function(nodeX, nodeY, root = document, i = 0) {
 		throw new Error('Infinite loop detected');
 	}
 	return (
-		Array.from(root.elementsFromPoint(nodeX, nodeY))
+		// IE can return null when there are no elements
+		Array.from(root.elementsFromPoint(nodeX, nodeY) || [])
 			// As of Chrome 66, elementFromPoint will return elements from parent trees.
 			// We only want to touch each tree once, so we're filtering out nodes on other trees.
 			.filter(nodes => dom.getRootNode(nodes) === root)

data/node_modules/axe-core/lib/core/base/audit.js

@@ -1,4 +1,6 @@
 /*global Rule, Check, RuleResult, commons: true */
+const dotRegex = /\{\{.+?\}\}/g;
+
 /*eslint no-unused-vars: 0*/
 function getDefaultConfiguration(audit) {
 	'use strict';
@@ -146,10 +148,10 @@ const mergeCheckLocale = (a, b) => {
 	let { pass, fail } = b;
 	// If the message(s) are Strings, they have not yet been run
 	// thru doT (which will return a Function).
-	if (typeof pass === 'string') {
+	if (typeof pass === 'string' && dotRegex.test(pass)) {
 		pass = axe.imports.doT.compile(pass);
 	}
-	if (typeof fail === 'string') {
+	if (typeof fail === 'string' && dotRegex.test(fail)) {
 		fail = axe.imports.doT.compile(fail);
 	}
 	return {
@@ -177,10 +179,10 @@ const mergeRuleLocale = (a, b) => {
 	let { help, description } = b;
 	// If the message(s) are Strings, they have not yet been run
 	// thru doT (which will return a Function).
-	if (typeof help === 'string') {
+	if (typeof help === 'string' && dotRegex.test(help)) {
 		help = axe.imports.doT.compile(help);
 	}
-	if (typeof description === 'string') {
+	if (typeof description === 'string' && dotRegex.test(description)) {
 		description = axe.imports.doT.compile(description);
 	}
 	return {
@@ -198,7 +200,7 @@ const mergeFailureMessage = (a, b) => {
 	let { failureMessage } = b;
 	// If the message(s) are Strings, they have not yet been run
 	// thru doT (which will return a Function).
-	if (typeof failureMessage === 'string') {
+	if (typeof failureMessage === 'string' && dotRegex.test(failureMessage)) {
 		failureMessage = axe.imports.doT.compile(failureMessage);
 	}
 	return {
@@ -212,7 +214,7 @@ const mergeFailureMessage = (a, b) => {
  */
 
 const mergeFallbackMessage = (a, b) => {
-	if (typeof b === 'string') {
+	if (typeof b === 'string' && dotRegex.test(b)) {
 		b = axe.imports.doT.compile(b);
 	}
 	return b || a;
@@ -630,13 +632,37 @@ Audit.prototype.normalizeOptions = function(options) {
 	'use strict';
 	var audit = this;
 
+	const tags = [];
+	const ruleIds = [];
+	audit.rules.forEach(rule => {
+		ruleIds.push(rule.id);
+		rule.tags.forEach(tag => {
+			if (!tags.includes(tag)) {
+				tags.push(tag);
+			}
+		});
+	});
+
 	// Validate runOnly
 	if (typeof options.runOnly === 'object') {
 		if (Array.isArray(options.runOnly)) {
-			options.runOnly = {
-				type: 'tag',
-				values: options.runOnly
-			};
+			const hasTag = options.runOnly.find(value => tags.includes(value));
+			const hasRule = options.runOnly.find(value => ruleIds.includes(value));
+
+			if (hasTag && hasRule) {
+				throw new Error('runOnly cannot be both rules and tags');
+			}
+			if (hasRule) {
+				options.runOnly = {
+					type: 'rule',
+					values: options.runOnly
+				};
+			} else {
+				options.runOnly = {
+					type: 'tag',
+					values: options.runOnly
+				};
+			}
 		}
 		const only = options.runOnly;
 		if (only.value && !only.values) {
@@ -652,7 +678,7 @@ Audit.prototype.normalizeOptions = function(options) {
 		if (['rule', 'rules'].includes(only.type)) {
 			only.type = 'rule';
 			only.values.forEach(function(ruleId) {
-				if (!audit.getRule(ruleId)) {
+				if (!ruleIds.includes(ruleId)) {
 					throw new Error('unknown rule `' + ruleId + '` in options.runOnly');
 				}
 			});
@@ -660,11 +686,7 @@ Audit.prototype.normalizeOptions = function(options) {
 			// Validate 'tags' (e.g. anything not 'rule')
 		} else if (['tag', 'tags', undefined].includes(only.type)) {
 			only.type = 'tag';
-			const unmatchedTags = audit.rules.reduce((unmatchedTags, rule) => {
-				return unmatchedTags.length
-					? unmatchedTags.filter(tag => !rule.tags.includes(tag))
-					: unmatchedTags;
-			}, only.values);
+			const unmatchedTags = only.values.filter(tag => !tags.includes(tag));
 
 			if (unmatchedTags.length !== 0) {
 				axe.log('Could not find tags `' + unmatchedTags.join('`, `') + '`');
@@ -676,7 +698,7 @@ Audit.prototype.normalizeOptions = function(options) {
 
 	if (typeof options.rules === 'object') {
 		Object.keys(options.rules).forEach(function(ruleId) {
-			if (!audit.getRule(ruleId)) {
+			if (!ruleIds.includes(ruleId)) {
 				throw new Error('unknown rule `' + ruleId + '` in options.rules');
 			}
 		});

data/node_modules/axe-core/lib/core/base/virtual-node/serial-virtual-node.js

@@ -84,3 +84,5 @@ function normaliseAttrs({ attributes = {} }) {
 		return attrs;
 	}, {});
 }
+
+axe.SerialVirtualNode = SerialVirtualNode;

data/node_modules/axe-core/lib/core/base/virtual-node/virtual-node.js

@@ -61,6 +61,23 @@ class VirtualNode extends axe.AbstractVirtualNode {
 		return this.actualNode.hasAttribute(attrName);
 	}
 
+	/**
+	 * Return a property of the computed style for this element and cache the result. This is much faster than called `getPropteryValue` every time.
+	 * @see https://jsperf.com/get-property-value
+	 * @return {String}
+	 */
+	getComputedStylePropertyValue(property) {
+		const key = 'computedStyle_' + property;
+		if (!this._cache.hasOwnProperty(key)) {
+			if (!this._cache.hasOwnProperty('computedStyle')) {
+				this._cache.computedStyle = window.getComputedStyle(this.actualNode);
+			}
+
+			this._cache[key] = this._cache.computedStyle.getPropertyValue(property);
+		}
+		return this._cache[key];
+	}
+
 	/**
 	 * Determine if the element is focusable and cache the result.
 	 * @return {Boolean} True if the element is focusable, false otherwise.
@@ -82,4 +99,30 @@ class VirtualNode extends axe.AbstractVirtualNode {
 		}
 		return this._cache.tabbableElements;
 	}
+
+	/**
+	 * Return the client rects for this element and cache the result.
+	 * @return {DOMRect[]}
+	 */
+	get clientRects() {
+		if (!this._cache.hasOwnProperty('clientRects')) {
+			this._cache.clientRects = Array.from(
+				this.actualNode.getClientRects()
+			).filter(rect => rect.width > 0);
+		}
+		return this._cache.clientRects;
+	}
+
+	/**
+	 * Return the bounding rect for this element and cache the result.
+	 * @return {DOMRect}
+	 */
+	get boundingClientRect() {
+		if (!this._cache.hasOwnProperty('boundingClientRect')) {
+			this._cache.boundingClientRect = this.actualNode.getBoundingClientRect();
+		}
+		return this._cache.boundingClientRect;
+	}
 }
+
+axe.VirtualNode = VirtualNode;

data/node_modules/axe-core/lib/core/reporters/helpers/incomplete-fallback-msg.js

@@ -7,5 +7,7 @@
  */
 helpers.incompleteFallbackMessage = function incompleteFallbackMessage() {
 	'use strict';
-	return axe._audit.data.incompleteFallbackMessage();
+	return typeof axe._audit.data.incompleteFallbackMessage === 'function'
+		? axe._audit.data.incompleteFallbackMessage()
+		: axe._audit.data.incompleteFallbackMessage;
 };

data/node_modules/axe-core/lib/core/utils/parse-crossorigin-stylesheet.js

@@ -19,6 +19,7 @@ axe.utils.parseCrossOriginStylesheet = function parseCrossOriginStylesheet(
 ) {
 	const axiosOptions = {
 		method: 'get',
+		timeout: axe.constants.preload.timeout,
 		url
 	};
 

data/node_modules/axe-core/lib/core/utils/preload-cssom.js

@@ -33,9 +33,10 @@ axe.utils.preloadCssom = function preloadCssom({ treeRoot = axe._tree[0] }) {
 
 	const convertDataToStylesheet = axe.utils.getStyleSheetFactory(dynamicDoc);
 
-	return getCssomForAllRootNodes(rootNodes, convertDataToStylesheet).then(
-		assets => flattenAssets(assets)
-	);
+	return getCssomForAllRootNodes(
+		rootNodes,
+		convertDataToStylesheet
+	).then(assets => flattenAssets(assets));
 };
 
 /**

data/node_modules/axe-core/lib/core/utils/process-message.js

@@ -0,0 +1,72 @@
+/* global helpers */
+const dataRegex = /\$\{\s?data\s?\}/g;
+
+/**
+ * Replace a placeholder with the value of a data string or object
+ * @param {String} str
+ * @param {String|Object} data
+ */
+function substitute(str, data) {
+	// replace all instances of ${ data } with the value of the string
+	if (typeof data === 'string') {
+		return str.replace(dataRegex, data);
+	}
+
+	// replace all instances of ${ data[prop] } with the value of the property
+	for (const prop in data) {
+		if (data.hasOwnProperty(prop)) {
+			const regex = new RegExp('\\${\\s?data\\.' + prop + '\\s?}', 'g');
+			str = str.replace(regex, data[prop]);
+		}
+	}
+
+	return str;
+}
+
+/**
+ * Process a metadata message.
+ * @param {String|Object} message
+ * @param {Object} data
+ * @return {String}
+ */
+axe.utils.processMessage = function processMessage(message, data) {
+	if (!message) {
+		return;
+	}
+
+	// data as array
+	if (Array.isArray(data)) {
+		data.values = data.join(', ');
+
+		if (
+			typeof message.singular === 'string' &&
+			typeof message.plural === 'string'
+		) {
+			const str = data.length === 1 ? message.singular : message.plural;
+			return substitute(str, data);
+		}
+
+		// no singular/plural message so just pass data
+		return substitute(message, data);
+	}
+
+	// message is a string that uses data as a string or object properties
+	if (typeof message === 'string') {
+		return substitute(message, data);
+	}
+
+	// message is an object that uses value of data to determine message
+	if (typeof data === 'string') {
+		const str = message[data];
+		return substitute(str, data);
+	}
+
+	// message uses value of data property to determine message
+	let str = message.default || helpers.incompleteFallbackMessage();
+
+	if (data && data.messageKey && message[data.messageKey]) {
+		str = message[data.messageKey];
+	}
+
+	return processMessage(str, data);
+};

data/node_modules/axe-core/lib/core/utils/publish-metadata.js

@@ -1,4 +1,4 @@
-/*global helpers */
+/* global helpers */
 /**
  * Construct incomplete message from check.data
  * @param  {Object} checkData Check result with reason specified
@@ -30,10 +30,13 @@ function getIncompleteReason(checkData, messages) {
 				return getDefaultMsg(messages);
 			}
 		}
+	} else if (checkData && checkData.messageKey) {
+		return messages.incomplete[checkData.messageKey];
 	} else {
 		return getDefaultMsg(messages);
 	}
 }
+
 /**
  * Extend checksData with the correct result message
  * @param  {Object} checksData The check result data
@@ -49,18 +52,28 @@ function extender(checksData, shouldBeTrue) {
 		var data = Object.assign({}, sourceData);
 		delete data.messages;
 		if (check.result === undefined) {
-			if (typeof messages.incomplete === 'object') {
-				data.message = function() {
-					return getIncompleteReason(check.data, messages);
-				};
-			} else {
-				// fall back to string function
+			// handle old doT template
+			if (
+				typeof messages.incomplete === 'object' &&
+				!Array.isArray(check.data)
+			) {
+				data.message = getIncompleteReason(check.data, messages);
+			}
+
+			// fallback to new process message style
+			if (!data.message) {
 				data.message = messages.incomplete;
 			}
 		} else {
 			data.message =
 				check.result === shouldBeTrue ? messages.pass : messages.fail;
 		}
+
+		// don't process doT template functions
+		if (typeof data.message !== 'function') {
+			data.message = axe.utils.processMessage(data.message, check.data);
+		}
+
 		axe.utils.extendMetaData(check, data);
 	};
 }

data/node_modules/axe-core/lib/rules/aria-dpub-role-fallback.json

@@ -2,11 +2,12 @@
 	"id": "aria-dpub-role-fallback",
 	"selector": "[role]",
 	"matches": "aria-dpub-role-fallback-matches.js",
-	"tags": ["cat.aria", "wcag2a", "wcag131"],
+	"tags": ["cat.aria", "wcag2a", "wcag131", "deprecated"],
 	"metadata": {
 		"description": "Ensures unsupported DPUB roles are only used on elements with implicit fallback roles",
 		"help": "Unsupported DPUB ARIA roles should be used on elements with implicit fallback roles"
 	},
+	"enabled": false,
 	"all": ["implicit-role-fallback"],
 	"any": [],
 	"none": []

data/node_modules/axe-core/lib/rules/label-content-name-mismatch-matches.js

@@ -26,7 +26,7 @@ if (!rolesWithNameFromContents.includes(role)) {
  * if no `aria-label` or `aria-labelledby` attribute - ignore `node`
  */
 if (
-	!text.sanitize(aria.arialabelText(node)) &&
+	!text.sanitize(aria.arialabelText(virtualNode)) &&
 	!text.sanitize(aria.arialabelledbyText(node))
 ) {
 	return false;

data/node_modules/axe-core/lib/rules/layout-table.json

@@ -2,11 +2,12 @@
 	"id": "layout-table",
 	"selector": "table",
 	"matches": "layout-table-matches.js",
-	"tags": ["cat.semantics", "wcag2a", "wcag131"],
+	"tags": ["cat.semantics", "wcag2a", "wcag131", "deprecated"],
 	"metadata": {
 		"description": "Ensures presentational <table> elements do not use <th>, <caption> elements or the summary attribute",
 		"help": "Layout tables must not use data table elements"
 	},
+	"enabled": false,
 	"all": [],
 	"any": [],
 	"none": ["has-th", "has-caption", "has-summary"]

data/node_modules/axe-core/locales/ja.json

@@ -685,7 +685,7 @@
 		},
 		"exists": {
 			"pass": "要素は存在していません",
-			"fail": "要素が存在しています"
+			"incomplete": "要素が存在しています"
 		},
 		"has-alt": {
 			"pass": "要素にalt属性が存在しています",

data/node_modules/axe-core/package.json

@@ -15,19 +15,19 @@
   ],
   "_from": "axe-core@>=3.4.1 <4.0.0",
   "_hasShrinkwrap": false,
-  "_id": "axe-core@3.4.1",
+  "_id": "axe-core@3.4.2",
   "_inCache": true,
   "_location": "/axe-core",
-  "_nodeVersion": "10.17.0",
+  "_nodeVersion": "10.14.0",
   "_npmOperationalInternal": {
     "host": "s3://npm-registry-packages",
-    "tmp": "tmp/axe-core_3.4.1_1576688221301_0.6001479670462013"
+    "tmp": "tmp/axe-core_3.4.2_1581014982110_0.3250163683829628"
   },
   "_npmUser": {
-    "name": "npmdeque",
-    "email": "axe@deque.com"
+    "name": "wilcofiers",
+    "email": "wilcofiers@gmail.com"
   },
-  "_npmVersion": "6.11.3",
+  "_npmVersion": "6.13.4",
   "_phantomChildren": {},
   "_requested": {
     "raw": "axe-core@^3.4.1",
@@ -41,8 +41,8 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/axe-core/-/axe-core-3.4.1.tgz",
-  "_shasum": "e42623918bb85b5ef674633852cb9029db0309c5",
+  "_resolved": "https://registry.npmjs.org/axe-core/-/axe-core-3.4.2.tgz",
+  "_shasum": "d51d2fcb401685e8b49a1dd94212da0759fd7ca0",
   "_shrinkwrap": null,
   "_spec": "axe-core@^3.4.1",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",
@@ -131,17 +131,17 @@
   },
   "directories": {},
   "dist": {
-    "integrity": "sha512-+EhIdwR0hF6aeMx46gFDUy6qyCfsL0DmBrV3Z+LxYbsOd8e1zBaPHa3f9Rbjsz2dEwSBkLw6TwML/CAIIAqRpw==",
-    "shasum": "e42623918bb85b5ef674633852cb9029db0309c5",
-    "tarball": "https://registry.npmjs.org/axe-core/-/axe-core-3.4.1.tgz",
-    "fileCount": 567,
-    "unpackedSize": 2431945,
-    "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd+lpdCRA9TVsSAnZWagAA+ugP/ROcxO85rr1hyKC17dMd\n4MohjiY3yMX+eMb/mAEHdgFcY0GIADGnxg2+qVluujKF9sAud+6Mhvqm5m3C\nyN1HL5ei2ikKIIBdGrVmBjIwg32j7Y26gjDT74neFESeWj8J97eL0auX2XJY\nw+PieGcuyXYZd/e7Nm8pXrLw3BoYDKdCTwZ1r/N3oo2NdmUtW2Ak/GNRZ/YJ\n2/2iCI305ME8Q1aygDdXxAmfSTExdWggzKJzBtui84TB+KzIlNx2NT9y08Xl\nKnxiCbcoo/E2JhqLNbvrIlR6E4dTlZhEzgFsPM9mEYXDUrsGMVMumr37LWN3\n1UO7qafVjiuLV+9BuNx5qMPWDgHrcEeoAtUoVhsjGxaxJHMZDVLs498QWcsy\n4r0gtxbNW94UpPtSp9pPbZiE0X4E1AIP/xh6KZX7LYdOVHc+k8bGUpft4sIo\nitHSLLz/7Lb+JktAUP+OdraYmHpI8tW902j4EV/yyJFl32DYdMdQpaGu2rH4\nQRPCow1YVQdqoha0gcKDU9tF71TYsfv2ZicweIEJmWUrlFHDmnnUrlLojeSp\nwgx0KzQUXt3WZatH4d40GdjGdLCZGTdRXbWpeTjZ/grIfXqA+vMyd/rfql5d\nvp5U3zH9YPmosgk54WnsJ+lFUDySB9eQ0vtSyWf0E+kSGi/NjYZ18ojoA425\npdma\r\n=SxSY\r\n-----END PGP SIGNATURE-----\r\n"
+    "integrity": "sha512-aPpM84KPiRfeaK3LhA9ag4OmjLUZkNKMH0sZuK+YRBS+QJcegjveidCyvWSBlBr/iIMQdn/1hU00e3YBiuTEdw==",
+    "shasum": "d51d2fcb401685e8b49a1dd94212da0759fd7ca0",
+    "tarball": "https://registry.npmjs.org/axe-core/-/axe-core-3.4.2.tgz",
+    "fileCount": 576,
+    "unpackedSize": 2929556,
+    "npm-signature": "-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJePF/GCRA9TVsSAnZWagAAbeEP/i0WNObH5qoxRV+5z1I5\nSWIaIj60P7FFPEyp39VQrmQM4uhCfb74+73yPOuTQF8PA/kicQ12Sb5IeDgb\nxpG1VBhC73YLa7/ab4WF5SrebQNPmejg+C2VLnxnctWz4irJVyap2qvIXGj1\nca+GdmvTz+gOqflv3eFjl5ByPGk5NOAbbIUL8WMu8dT4V/6MrHbHHeuNpRMO\nASDUxikTGbXGZspf8kezWmDr0n5VoikjkAefUINs2E3ZGDx5Of82a+8CGPTg\nhmjTGEPDpo9JYJweGNqDCgBTZgFWDht0T5PEj7/+w6GCd/ePAsDh5jD/5w3E\nn2mgY4zsiYNM/1gdU4LD3gD45h6MqtEETcY9OeDiKEWH17xv/3v05Z1fESek\nv+6sloZ8EExg/o5zsvhvWQNtmPtD37j/1hRhMYJFgp2oQskGfLBJUHSOnpxN\n+vbPtZDrp2+U4eBrX2dPgDIQABuOvWJ4gaTmNVwoSiV4ID/IOfBdE117nEAY\nVNR+rgpXnpt2AKaIQvTsHjFRrjiVoTXkQslMMGXjkOlD1fn3kMClW75yLy4I\nN/z/ErjWpmZ48vcT0u90LIgXLiJjcLsTG2rfNRnZe7H8Pjim85nRjXxze9gO\nUO+IGxMJ22VlGcCdBH1c5wO4PjO4LX7Au0aVaixq3xSaZrkIDE9bYO4i/dxr\nwgR6\r\n=Dtk7\r\n-----END PGP SIGNATURE-----\r\n"
   },
   "engines": {
     "node": ">=4"
   },
-  "gitHead": "9e76417d8d46c3c80d4c085ec03f32074ee5b50b",
+  "gitHead": "467df229adab25b2c8ca4df92a23ea9a9c3459c8",
   "homepage": "https://github.com/dequelabs/axe-core#readme",
   "keywords": [
     "Accessibility",
@@ -215,5 +215,5 @@
     }
   },
   "typings": "axe.d.ts",
-  "version": "3.4.1"
+  "version": "3.4.2"
 }