govuk_publishing_components 21.22.1 → 21.22.2

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

@@ -0,0 +1,65 @@
+/**
+ * Given a rootNode
+ * -> get all HTMLMediaElement's and ensure their metadata is loaded
+ *
+ * @method preloadMedia
+ * @memberof axe.utils
+ * @property {Object} options.treeRoot (optional) the DOM tree to be inspected
+ */
+axe.utils.preloadMedia = function preloadMedia({ treeRoot = axe._tree[0] }) {
+	const mediaVirtualNodes = axe.utils.querySelectorAllFilter(
+		treeRoot,
+		'video, audio',
+		({ actualNode }) => {
+			/**
+			 * this is to safe-gaurd against empty `src` values which can get resolved `window.location`, thus never preloading as the URL is not a media asset
+			 */
+			if (actualNode.hasAttribute('src')) {
+				return !!actualNode.getAttribute('src');
+			}
+
+			/**
+			 * The `src` on <source> element is essential for `audio` and `video` elements
+			 */
+			const sourceWithSrc = Array.from(
+				actualNode.getElementsByTagName('source')
+			).filter(source => !!source.getAttribute('src'));
+			if (sourceWithSrc.length <= 0) {
+				return false;
+			}
+
+			return true;
+		}
+	);
+
+	return Promise.all(
+		mediaVirtualNodes.map(({ actualNode }) => isMediaElementReady(actualNode))
+	);
+};
+
+/**
+ * Ensures a media element's metadata is loaded
+ * @param {HTMLMediaElement} elm elm
+ * @returns {Promise}
+ */
+function isMediaElementReady(elm) {
+	return new Promise(resolve => {
+		/**
+		 * See - https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/readyState
+		 */
+		if (elm.readyState > 0) {
+			resolve(elm);
+		}
+
+		function onMediaReady() {
+			elm.removeEventListener('loadedmetadata', onMediaReady);
+			resolve(elm);
+		}
+
+		/**
+		 * Given media is not ready, wire up listener for `loadedmetadata`
+		 * See - https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/loadedmetadata_event
+		 */
+		elm.addEventListener('loadedmetadata', onMediaReady);
+	});
+}

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

@@ -66,7 +66,7 @@ axe.utils.getPreloadConfig = function getPreloadConfig(options) {
 	if (
 		options.preload.timeout &&
 		typeof options.preload.timeout === 'number' &&
-		!Number.isNaN(options.preload.timeout)
+		!isNaN(options.preload.timeout)
 	) {
 		config.timeout = options.preload.timeout;
 	}
@@ -81,7 +81,8 @@ axe.utils.getPreloadConfig = function getPreloadConfig(options) {
  */
 axe.utils.preload = function preload(options) {
 	const preloadFunctionsMap = {
-		cssom: axe.utils.preloadCssom
+		cssom: axe.utils.preloadCssom,
+		media: axe.utils.preloadMedia
 	};
 
 	const shouldPreload = axe.utils.shouldPreload(options);
@@ -96,12 +97,14 @@ axe.utils.preload = function preload(options) {
 		 * Start `timeout` timer for preloading assets
 		 * -> reject if allowed time expires.
 		 */
-		setTimeout(() => reject(`Preload assets timed out.`), timeout);
+		const preloadTimeout = setTimeout(
+			() => reject(new Error(`Preload assets timed out.`)),
+			timeout
+		);
 
 		/**
 		 * Fetch requested `assets`
 		 */
-
 		Promise.all(
 			assets.map(asset =>
 				preloadFunctionsMap[asset](options).then(results => {
@@ -110,26 +113,32 @@ axe.utils.preload = function preload(options) {
 					};
 				})
 			)
-		).then(results => {
-			/**
-			 * Combine array of results into an object map
-			 *
-			 * From ->
-			 * 	[{cssom: [...], aom: [...]}]
-			 * To ->
-			 * 	{
-			 * 		cssom: [...]
-			 * 	 	aom: [...]
-			 * 	}
-			 */
-			const preloadAssets = results.reduce((out, result) => {
-				return {
-					...out,
-					...result
-				};
-			}, {});
+		)
+			.then(results => {
+				/**
+				 * Combine array of results into an object map
+				 *
+				 * From ->
+				 * 	[{cssom: [...], aom: [...]}]
+				 * To ->
+				 * 	{
+				 * 		cssom: [...]
+				 * 	 	aom: [...]
+				 * 	}
+				 */
+				const preloadAssets = results.reduce((out, result) => {
+					return {
+						...out,
+						...result
+					};
+				}, {});
 
-			resolve(preloadAssets);
-		});
+				clearTimeout(preloadTimeout);
+				resolve(preloadAssets);
+			})
+			.catch(err => {
+				clearTimeout(preloadTimeout);
+				reject(err);
+			});
 	});
 };

data/node_modules/axe-core/lib/core/utils/qsa.js

@@ -1,191 +1,3 @@
-// The lines below is because the latedef option does not work
-var convertExpressions = function() {};
-var matchExpressions = function() {};
-
-// todo: implement an option to follow aria-owns
-
-function matchesTag(vNode, exp) {
-	return (
-		vNode.props.nodeType === 1 &&
-		(exp.tag === '*' || vNode.props.nodeName === exp.tag)
-	);
-}
-
-function matchesClasses(vNode, exp) {
-	return !exp.classes || exp.classes.every(cl => vNode.hasClass(cl.value));
-}
-
-function matchesAttributes(vNode, exp) {
-	return (
-		!exp.attributes ||
-		exp.attributes.every(att => {
-			var nodeAtt = vNode.attr(att.key);
-			return nodeAtt !== null && (!att.value || att.test(nodeAtt));
-		})
-	);
-}
-
-function matchesId(vNode, exp) {
-	return !exp.id || vNode.props.id === exp.id;
-}
-
-function matchesPseudos(target, exp) {
-	if (
-		!exp.pseudos ||
-		exp.pseudos.every(pseudo => {
-			if (pseudo.name === 'not') {
-				return !matchExpressions([target], pseudo.expressions, false).length;
-			}
-			throw new Error(
-				'the pseudo selector ' + pseudo.name + ' has not yet been implemented'
-			);
-		})
-	) {
-		return true;
-	}
-	return false;
-}
-
-var escapeRegExp = (function() {
-	/*! Credit: XRegExp 0.6.1 (c) 2007-2008 Steven Levithan <http://stevenlevithan.com/regex/xregexp/> MIT License */
-	var from = /(?=[\-\[\]{}()*+?.\\\^$|,#\s])/g;
-	var to = '\\';
-	return function(string) {
-		return string.replace(from, to);
-	};
-})();
-
-var reUnescape = /\\/g;
-
-function convertAttributes(atts) {
-	/*! Credit Mootools Copyright Mootools, MIT License */
-	if (!atts) {
-		return;
-	}
-	return atts.map(att => {
-		var attributeKey = att.name.replace(reUnescape, '');
-		var attributeValue = (att.value || '').replace(reUnescape, '');
-		var test, regexp;
-
-		switch (att.operator) {
-			case '^=':
-				regexp = new RegExp('^' + escapeRegExp(attributeValue));
-				break;
-			case '$=':
-				regexp = new RegExp(escapeRegExp(attributeValue) + '$');
-				break;
-			case '~=':
-				regexp = new RegExp(
-					'(^|\\s)' + escapeRegExp(attributeValue) + '(\\s|$)'
-				);
-				break;
-			case '|=':
-				regexp = new RegExp('^' + escapeRegExp(attributeValue) + '(-|$)');
-				break;
-			case '=':
-				test = function(value) {
-					return attributeValue === value;
-				};
-				break;
-			case '*=':
-				test = function(value) {
-					return value && value.includes(attributeValue);
-				};
-				break;
-			case '!=':
-				test = function(value) {
-					return attributeValue !== value;
-				};
-				break;
-			default:
-				test = function(value) {
-					return !!value;
-				};
-		}
-
-		if (attributeValue === '' && /^[*$^]=$/.test(att.operator)) {
-			test = function() {
-				return false;
-			};
-		}
-
-		if (!test) {
-			test = function(value) {
-				return value && regexp.test(value);
-			};
-		}
-		return {
-			key: attributeKey,
-			value: attributeValue,
-			test: test
-		};
-	});
-}
-
-function convertClasses(classes) {
-	if (!classes) {
-		return;
-	}
-	return classes.map(className => {
-		className = className.replace(reUnescape, '');
-
-		return {
-			value: className,
-			regexp: new RegExp('(^|\\s)' + escapeRegExp(className) + '(\\s|$)')
-		};
-	});
-}
-
-function convertPseudos(pseudos) {
-	if (!pseudos) {
-		return;
-	}
-	return pseudos.map(p => {
-		var expressions;
-
-		if (p.name === 'not') {
-			expressions = p.value;
-			expressions = expressions.selectors
-				? expressions.selectors
-				: [expressions];
-			expressions = convertExpressions(expressions);
-		}
-		return {
-			name: p.name,
-			expressions: expressions,
-			value: p.value
-		};
-	});
-}
-
-/**
- * convert the css-selector-parser format into the Slick format
- * @private
- * @param Array {Object} expressions
- * @return Array {Object}
- *
- */
-convertExpressions = function(expressions) {
-	return expressions.map(exp => {
-		var newExp = [];
-		var rule = exp.rule;
-		while (rule) {
-			/* eslint no-restricted-syntax: 0 */
-			// `.tagName` is a property coming from the `CSSSelectorParser` library
-			newExp.push({
-				tag: rule.tagName ? rule.tagName.toLowerCase() : '*',
-				combinator: rule.nestingOperator ? rule.nestingOperator : ' ',
-				id: rule.id,
-				attributes: convertAttributes(rule.attrs),
-				classes: convertClasses(rule.classNames),
-				pseudos: convertPseudos(rule.pseudos)
-			});
-			rule = rule.rule;
-		}
-		return newExp;
-	});
-};
-
 function createLocalVariables(vNodes, anyLevel, thisLevel, parentShadowId) {
 	let retVal = {
 		vNodes: vNodes.slice(),
@@ -197,17 +9,7 @@ function createLocalVariables(vNodes, anyLevel, thisLevel, parentShadowId) {
 	return retVal;
 }
 
-function matchesSelector(vNode, exp) {
-	return (
-		matchesTag(vNode, exp[0]) &&
-		matchesClasses(vNode, exp[0]) &&
-		matchesAttributes(vNode, exp[0]) &&
-		matchesId(vNode, exp[0]) &&
-		matchesPseudos(vNode, exp[0])
-	);
-}
-
-matchExpressions = function(domTree, expressions, recurse, filter) {
+function matchExpressions(domTree, expressions, filter) {
 	let stack = [];
 	let vNodes = Array.isArray(domTree) ? domTree : [domTree];
 	let currentLevel = createLocalVariables(
@@ -229,7 +31,7 @@ matchExpressions = function(domTree, expressions, recurse, filter) {
 			let exp = combined[i];
 			if (
 				(!exp[0].id || vNode.shadowId === currentLevel.parentShadowId) &&
-				matchesSelector(vNode, exp)
+				axe.utils.matchesExpression(vNode, exp[0])
 			) {
 				if (exp.length === 1) {
 					if (!added && (!filter || filter(vNode))) {
@@ -260,8 +62,8 @@ matchExpressions = function(domTree, expressions, recurse, filter) {
 				childAny.push(exp);
 			}
 		}
-		// "recurse"
-		if (vNode.children && vNode.children.length && recurse) {
+
+		if (vNode.children && vNode.children.length) {
 			stack.push(currentLevel);
 			currentLevel = createLocalVariables(
 				vNode.children,
@@ -276,7 +78,7 @@ matchExpressions = function(domTree, expressions, recurse, filter) {
 		}
 	}
 	return result;
-};
+}
 
 /**
  * querySelectorAll implementation that operates on the flattened tree (supports shadow DOM)
@@ -301,11 +103,8 @@ axe.utils.querySelectorAll = function(domTree, selector) {
  * @param	{Function} filter function (optional)
  * @return {Array} Elements matched by any of the selectors and filtered by the filter function
  */
-
 axe.utils.querySelectorAllFilter = function(domTree, selector, filter) {
 	domTree = Array.isArray(domTree) ? domTree : [domTree];
-	var expressions = axe.utils.cssParser.parse(selector);
-	expressions = expressions.selectors ? expressions.selectors : [expressions];
-	expressions = convertExpressions(expressions);
-	return matchExpressions(domTree, expressions, true, filter);
+	const expressions = axe.utils.convertSelector(selector);
+	return matchExpressions(domTree, expressions, filter);
 };

data/node_modules/axe-core/lib/rules/aria-hidden-focus.json

@@ -8,7 +8,11 @@
 		"description": "Ensures aria-hidden elements do not contain focusable elements",
 		"help": "ARIA hidden element must not contain focusable elements"
 	},
-	"all": ["focusable-disabled", "focusable-not-tabbable"],
+	"all": [
+		"focusable-modal-open",
+		"focusable-disabled",
+		"focusable-not-tabbable"
+	],
 	"any": [],
 	"none": []
 }

data/node_modules/axe-core/lib/rules/aria-roles.json

@@ -8,5 +8,5 @@
 	},
 	"all": [],
 	"any": [],
-	"none": ["invalidrole", "abstractrole", "unsupportedrole"]
+	"none": ["fallbackrole", "invalidrole", "abstractrole", "unsupportedrole"]
 }

data/node_modules/axe-core/lib/rules/button-name.json

@@ -22,4 +22,4 @@
 		"non-empty-title"
 	],
 	"none": []
-}
+}

data/node_modules/axe-core/lib/rules/color-contrast-matches.js

@@ -98,7 +98,7 @@ if (
 	visibleText === '' ||
 	axe.commons.text.removeUnicode(visibleText, {
 		emoji: true,
-		nonBmp: true,
+		nonBmp: false,
 		punctuations: true
 	}) === ''
 ) {

data/node_modules/axe-core/lib/rules/color-contrast.json

@@ -2,9 +2,6 @@
 	"id": "color-contrast",
 	"matches": "color-contrast-matches.js",
 	"excludeHidden": false,
-	"options": {
-		"noScroll": false
-	},
 	"tags": ["cat.color", "wcag2aa", "wcag143"],
 	"metadata": {
 		"description": "Ensures the contrast between foreground and background colors meets WCAG 2 AA contrast ratio thresholds",