Skip to content

Conversation

@gaganmBrowserStack
Copy link
Collaborator

<< Describe the changes >>

Closes:

@gaganmBrowserStack gaganmBrowserStack changed the title Adding Bucket 1 chore: Axe-core Upgrade Phase 2 Dec 29, 2025
@gaganmBrowserStack gaganmBrowserStack changed the title chore: Axe-core Upgrade Phase 2 chore: AXE-2572 Axe-core Upgrade Phase 2 Dec 29, 2025
Base automatically changed from release-5.14.0 to main January 2, 2026 11:15
@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging lib/rules/p-as-heading.json
CONFLICT (content): Merge conflict in lib/rules/p-as-heading.json
Auto-merging lib/rules/label-content-name-mismatch.json
CONFLICT (content): Merge conflict in lib/rules/label-content-name-mismatch.json
Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Auto-merging build/tasks/validate.js
Automatic merge failed; fix conflicts and then commit the result.'

@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Auto-merging build/tasks/validate.js
Automatic merge failed; fix conflicts and then commit the result.'

@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Automatic merge failed; fix conflicts and then commit the result.'

@gaganmBrowserStack gaganmBrowserStack changed the base branch from main to 4.9.0-upgrade January 7, 2026 13:43
@gaganmBrowserStack gaganmBrowserStack changed the base branch from 4.9.0-upgrade to main January 7, 2026 13:43
@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Automatic merge failed; fix conflicts and then commit the result.'

@gaganmBrowserStack gaganmBrowserStack changed the base branch from main to Upgrade-to-4.11 January 8, 2026 07:42
@gaganmBrowserStack gaganmBrowserStack changed the base branch from Upgrade-to-4.11 to main January 8, 2026 07:43
@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Automatic merge failed; fix conflicts and then commit the result.'

1 similar comment
@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Automatic merge failed; fix conflicts and then commit the result.'

@gaganmBrowserStack gaganmBrowserStack changed the base branch from main to Upgrade-to-4.11 January 8, 2026 08:32
@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Automatic merge failed; fix conflicts and then commit the result.'

@gaganmBrowserStack gaganmBrowserStack changed the base branch from Upgrade-to-4.11 to main January 8, 2026 08:37
…e-core into AXE-2572-phase-2-analysis-and-segregation-of-enhancements
@deploybs-com
Copy link
Collaborator

Error found in CSV related to Git Merge:

Error occured while merging master/main - Cmd('git') failed due to: exit code(1)
cmdline: git merge main
stdout: 'Auto-merging doc/rule-descriptions.md
CONFLICT (content): Merge conflict in doc/rule-descriptions.md
Automatic merge failed; fix conflicts and then commit the result.'

Comment on lines 169 to 182
function getSource(element) {
if (!element?.outerHTML) {
if (!element) {
return '';
}
var source = element.outerHTML;
if (!source && typeof window.XMLSerializer === 'function') {
source = new window.XMLSerializer().serializeToString(element);
}
let htmlString = truncate(source || '');
// Remove unwanted attributes
const regex = /\s*data-percy-[^=]+="[^"]*"/g;
htmlString = htmlString.replace(regex, '');
return htmlString;

return truncateElement(element);
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverting a11y-engine changes here - pls check

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

disable or remove this workflow - not applicable for us

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rebase PR towards release branch to test out this workflow post merge

Rule.prototype._logGatherPerformance = function _logGatherPerformance() {
// log('gather (', nodes.length, '):', performanceTimer.timeElapsed() + 'ms');
Rule.prototype._logGatherPerformance = function _logGatherPerformance(nodes) {
log(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this log show up in browser console?

Comment on lines -16 to -37
let index = 0;
if (parent.nodeName === 'BODY') {
let count = 0;
// Single pass over siblings: count valid children & locate node position.
for (
let sib = parent.firstElementChild;
sib;
sib = sib.nextElementSibling
) {
if (sib.hasAttribute('data-percy-injected')) {
continue;
}
count++;
if (sib === node) {
index = count;
}
}
nthChild = count > 1 ? `:nth-child(${index})` : '';
} else {
index = Array.prototype.indexOf.call(parent.children, node) + 1;
nthChild = `:nth-child(${index})`;
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a11y-engine changes are getting reverted


// this.logMeasures('axe');
this.measure('axe', 'mark_axe_start', 'mark_axe_end', true);
this.logMeasures('axe');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getting reverted - pls verify

);
// log audit/rule measures
// this.logMeasures();
this.logMeasures(); // was commented out previously
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

Comment on lines -76 to -86
if (window.performance && window.performance.measure !== undefined) {
if (Object.keys(details).length > 0) {
const measureOpts = {
detail: details,
start: startMark,
end: endMark
};
window.performance.measure(measureName, measureOpts);
} else {
window.performance.measure(measureName, startMark, endMark);
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a11y-engine changes getting reverted

* Starts from the most recent start()/auditStart() call.
* @param {String|undefined} measureName If provided, will only log up to the first matching measure.
*/
logMeasures(measureName) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this function should be commented everywhere it is getting called

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants