From b39b0e60b68f8c1e34dc056809a04f8ccf8f24c7 Mon Sep 17 00:00:00 2001 From: Steven Lambert <2433219+straker@users.noreply.github.com> Date: Fri, 15 Dec 2023 09:51:51 -0700 Subject: [PATCH 1/2] fix: add Object.values polyfill for node <=6 (#4274) * fix: add Object.values polyfill for node <=6 * rename file * forgot to commit eslint --- .eslintrc.js | 5 +- lib/core/imports/index.js | 35 +----- .../pollyfills.js => imports/polyfills.js} | 115 ++++++------------ lib/core/utils/index.js | 2 +- .../utils/pollyfill-elements-from-point.js | 73 +++++++++++ 5 files changed, 120 insertions(+), 110 deletions(-) rename lib/core/{utils/pollyfills.js => imports/polyfills.js} (78%) create mode 100644 lib/core/utils/pollyfill-elements-from-point.js diff --git a/.eslintrc.js b/.eslintrc.js index 0dd3a87d43..d5dd272f22 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -109,7 +109,10 @@ module.exports = { }, { // polyfills are mostly copy-pasted from sources so we don't control their styling - files: ['lib/core/utils/pollyfills.js'], + files: [ + 'lib/core/imports/polyfills.js', + 'lib/core/utils/pollyfill-elements-from-point.js' + ], env: { browser: false }, diff --git a/lib/core/imports/index.js b/lib/core/imports/index.js index 63622d7636..80aa717d57 100644 --- a/lib/core/imports/index.js +++ b/lib/core/imports/index.js @@ -1,45 +1,16 @@ +import './polyfills'; + +// some of these imports require polyfills to be loaded first import { CssSelectorParser } from 'css-selector-parser'; import doT from '@deque/dot'; import emojiRegexText from 'emoji-regex'; import memoize from 'memoizee'; import Color from 'colorjs.io'; -import es6promise from 'es6-promise'; -import { Uint32Array } from 'typedarray'; -import 'weakmap-polyfill'; -import hasOwn from 'core-js-pure/actual/object/has-own'; - -if (!('hasOwn' in Object)) { - Object.hasOwn = hasOwn; -} - // prevent striping newline characters from strings (e.g. failure // summaries). value must be synced with build/configure.js doT.templateSettings.strip = false; -if (!('Promise' in window)) { - es6promise.polyfill(); -} - -if (!('Uint32Array' in window)) { - window.Uint32Array = Uint32Array; -} -if (window.Uint32Array) { - // @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray/some - if (!('some' in window.Uint32Array.prototype)) { - Object.defineProperty(window.Uint32Array.prototype, 'some', { - value: Array.prototype.some - }); - } - - if (!('reduce' in window.Uint32Array.prototype)) { - // @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray/reduce - Object.defineProperty(window.Uint32Array.prototype, 'reduce', { - value: Array.prototype.reduce - }); - } -} - /** * Namespace `axe.imports` which holds required external dependencies * diff --git a/lib/core/utils/pollyfills.js b/lib/core/imports/polyfills.js similarity index 78% rename from lib/core/utils/pollyfills.js rename to lib/core/imports/polyfills.js index 6829b80dc8..5725632e43 100644 --- a/lib/core/utils/pollyfills.js +++ b/lib/core/imports/polyfills.js @@ -1,8 +1,45 @@ +import es6promise from 'es6-promise'; +import { Uint32Array } from 'typedarray'; +import 'weakmap-polyfill'; +import hasOwn from 'core-js-pure/actual/object/has-own'; +import values from 'core-js-pure/actual/object/values'; + +if (!('hasOwn' in Object)) { + Object.hasOwn = hasOwn; +} + +if (!('values' in Object)) { + Object.values = values; +} + +if (!('Promise' in window)) { + es6promise.polyfill(); +} + +if (!('Uint32Array' in window)) { + window.Uint32Array = Uint32Array; +} +if (window.Uint32Array) { + // @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray/some + if (!('some' in window.Uint32Array.prototype)) { + Object.defineProperty(window.Uint32Array.prototype, 'some', { + value: Array.prototype.some + }); + } + + if (!('reduce' in window.Uint32Array.prototype)) { + // @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray/reduce + Object.defineProperty(window.Uint32Array.prototype, 'reduce', { + value: Array.prototype.reduce + }); + } +} + /* These polyfills came directly from the ES Specification itself Contained within: - - Object.assign - - Array.prototype.find + - Object.assign + - Array.prototype.find */ if (typeof Object.assign !== 'function') { (function () { @@ -76,80 +113,6 @@ if (!Array.prototype.findIndex) { }); } -// Spelled incorrectly intentionally (backwards compatibility). -export function pollyfillElementsFromPoint() { - if (document.elementsFromPoint) return document.elementsFromPoint; - if (document.msElementsFromPoint) return document.msElementsFromPoint; - - var usePointer = (function () { - var element = document.createElement('x'); - element.style.cssText = 'pointer-events:auto'; - return element.style.pointerEvents === 'auto'; - })(); - - var cssProp = usePointer ? 'pointer-events' : 'visibility'; - var cssDisableVal = usePointer ? 'none' : 'hidden'; - - var style = document.createElement('style'); - style.innerHTML = usePointer - ? '* { pointer-events: all }' - : '* { visibility: visible }'; - - return function (x, y) { - var current, i, d; - var elements = []; - var previousPointerEvents = []; - - // startup - document.head.appendChild(style); - - while ( - (current = document.elementFromPoint(x, y)) && - elements.indexOf(current) === -1 - ) { - // push the element and its current style - elements.push(current); - - previousPointerEvents.push({ - value: current.style.getPropertyValue(cssProp), - priority: current.style.getPropertyPriority(cssProp) - }); - - // add "pointer-events: none", to get to the underlying element - current.style.setProperty(cssProp, cssDisableVal, 'important'); - } - - // Due to negative index, documentElement could actually not be the last, - // so we'll simply move it to the end - if (elements.indexOf(document.documentElement) < elements.length - 1) { - elements.splice(elements.indexOf(document.documentElement), 1); - elements.push(document.documentElement); - } - - // restore the previous pointer-events values - for ( - i = previousPointerEvents.length; - !!(d = previousPointerEvents[--i]); - - ) { - elements[i].style.setProperty( - cssProp, - d.value ? d.value : '', - d.priority - ); - } - - // teardown; - document.head.removeChild(style); - - return elements; - }; -} - -if (typeof window.addEventListener === 'function') { - document.elementsFromPoint = pollyfillElementsFromPoint(); -} - if (!Array.prototype.includes) { Object.defineProperty(Array.prototype, 'includes', { value: function (searchElement) { diff --git a/lib/core/utils/index.js b/lib/core/utils/index.js index 6e18e7f99c..360c1d7283 100644 --- a/lib/core/utils/index.js +++ b/lib/core/utils/index.js @@ -63,7 +63,7 @@ export { default as parseCrossOriginStylesheet } from './parse-crossorigin-style export { default as parseSameOriginStylesheet } from './parse-sameorigin-stylesheet'; export { default as parseStylesheet } from './parse-stylesheet'; export { default as performanceTimer } from './performance-timer'; -export { pollyfillElementsFromPoint } from './pollyfills'; +export { pollyfillElementsFromPoint } from './pollyfill-elements-from-point'; export { default as preloadCssom } from './preload-cssom'; export { default as preloadMedia } from './preload-media'; export { default as preload, shouldPreload, getPreloadConfig } from './preload'; diff --git a/lib/core/utils/pollyfill-elements-from-point.js b/lib/core/utils/pollyfill-elements-from-point.js new file mode 100644 index 0000000000..1783f12946 --- /dev/null +++ b/lib/core/utils/pollyfill-elements-from-point.js @@ -0,0 +1,73 @@ +// Spelled incorrectly intentionally (backwards compatibility). +export function pollyfillElementsFromPoint() { + if (document.elementsFromPoint) return document.elementsFromPoint; + if (document.msElementsFromPoint) return document.msElementsFromPoint; + + var usePointer = (function () { + var element = document.createElement('x'); + element.style.cssText = 'pointer-events:auto'; + return element.style.pointerEvents === 'auto'; + })(); + + var cssProp = usePointer ? 'pointer-events' : 'visibility'; + var cssDisableVal = usePointer ? 'none' : 'hidden'; + + var style = document.createElement('style'); + style.innerHTML = usePointer + ? '* { pointer-events: all }' + : '* { visibility: visible }'; + + return function (x, y) { + var current, i, d; + var elements = []; + var previousPointerEvents = []; + + // startup + document.head.appendChild(style); + + while ( + (current = document.elementFromPoint(x, y)) && + elements.indexOf(current) === -1 + ) { + // push the element and its current style + elements.push(current); + + previousPointerEvents.push({ + value: current.style.getPropertyValue(cssProp), + priority: current.style.getPropertyPriority(cssProp) + }); + + // add "pointer-events: none", to get to the underlying element + current.style.setProperty(cssProp, cssDisableVal, 'important'); + } + + // Due to negative index, documentElement could actually not be the last, + // so we'll simply move it to the end + if (elements.indexOf(document.documentElement) < elements.length - 1) { + elements.splice(elements.indexOf(document.documentElement), 1); + elements.push(document.documentElement); + } + + // restore the previous pointer-events values + for ( + i = previousPointerEvents.length; + !!(d = previousPointerEvents[--i]); + + ) { + elements[i].style.setProperty( + cssProp, + d.value ? d.value : '', + d.priority + ); + } + + // teardown; + document.head.removeChild(style); + + return elements; + }; +} + +if (typeof window.addEventListener === 'function') { + document.elementsFromPoint = pollyfillElementsFromPoint(); +} From be789dca86a727efc00868cb1863e612a7ab7f8e Mon Sep 17 00:00:00 2001 From: Steven Lambert <2433219+straker@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:39:45 -0700 Subject: [PATCH 2/2] chore(release): 4.8.3 --- CHANGELOG.md | 6 ++++++ bower.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- sri-history.json | 4 ++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6aede4670..f0fe5c41da 100644 --- 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. +### [4.8.3](https://github.com/dequelabs/axe-core/compare/v4.8.2...v4.8.3) (2023-12-18) + +### Bug Fixes + +- add Object.values polyfill for node <=6 ([#4274](https://github.com/dequelabs/axe-core/issues/4274)) ([b39b0e6](https://github.com/dequelabs/axe-core/commit/b39b0e60b68f8c1e34dc056809a04f8ccf8f24c7)) + ### [4.8.2](https://github.com/dequelabs/axe-core/compare/v4.8.1...v4.8.2) (2023-09-18) ### Bug Fixes diff --git a/bower.json b/bower.json index d9aea5c26d..fac1bab71a 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "axe-core", - "version": "4.8.2", + "version": "4.8.3", "deprecated": true, "contributors": [ { diff --git a/package-lock.json b/package-lock.json index c764ae24e5..820325f185 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "axe-core", - "version": "4.8.2", + "version": "4.8.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "axe-core", - "version": "4.8.2", + "version": "4.8.3", "license": "MPL-2.0", "devDependencies": { "@axe-core/webdriverjs": "^4.5.2", diff --git a/package.json b/package.json index ebbeb67dd6..a6c34d59c3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "axe-core", "description": "Accessibility engine for automated Web UI testing", - "version": "4.8.2", + "version": "4.8.3", "license": "MPL-2.0", "engines": { "node": ">=4" diff --git a/sri-history.json b/sri-history.json index c8398cf348..a842d92fa6 100644 --- a/sri-history.json +++ b/sri-history.json @@ -362,5 +362,9 @@ "4.8.2": { "axe.js": "sha256-VZuuruUDDRwfzCo4ZDDzXiVefuy4pSW6BlGx+D/ucC0=", "axe.min.js": "sha256-O9U055OcfxyKV61g3Qn7N9mvpJNht0RCPcFw+QjWTG4=" + }, + "4.8.3": { + "axe.js": "sha256-YWpAAdIo7fwKmLq8nJx1f6pwt7HAXwWm15RSGJKbxhw=", + "axe.min.js": "sha256-/mct+I/4SJnZ30Ce+j9T7ll9zPwzbJVrjdKpbKIP+NA=" } }