Skip to content

fix: sync with upstream csstree v3.2.1#125

Merged
nzakas merged 26 commits intoeslint:mainfrom
xbinaryx:sync-csstree
Mar 20, 2026
Merged

fix: sync with upstream csstree v3.2.1#125
nzakas merged 26 commits intoeslint:mainfrom
xbinaryx:sync-csstree

Conversation

@xbinaryx
Copy link
Copy Markdown

Prerequisites checklist

AI acknowledgment

  • I did not use AI to generate this PR.
  • (If the above is not checked) I have reviewed the AI-generated content before submitting.

What is the purpose of this pull request?

This PR updates @eslint/csstree to match upstream csstree.

Related Issues

Closes #118

Is there anything you'd like reviewers to focus on?

ryo-manba and others added 26 commits April 8, 2025 01:38
* Update mdn-data
* Update CSS syntax patch
When the `list` option is truthy (which is the default) or not specified, the parser uses a linked list (`List` instance) for children. When `list` is falsy, the parser uses arrays for children.
@eslint-github-bot eslint-github-bot Bot added the bug Something isn't working label Mar 13, 2026
@eslintbot eslintbot added this to Triage Mar 13, 2026
Copy link
Copy Markdown
Member

@nzakas nzakas left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for your hard work on this!

@nzakas
Copy link
Copy Markdown
Member

nzakas commented Mar 13, 2026

Would like @DMartens and @lumirlumir to review before merging.

@nzakas nzakas moved this from Needs Triage to Merge Candidates in Triage Mar 13, 2026
@nzakas nzakas moved this from Merge Candidates to Second Review Needed in Triage Mar 13, 2026
Copy link
Copy Markdown

@DMartens DMartens left a comment

Choose a reason for hiding this comment

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

Changes LGTM, thanks.

Copy link
Copy Markdown
Member

@lumirlumir lumirlumir left a comment

Choose a reason for hiding this comment

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

I think this PR needs to be merged using "Merge commits", not "Squash merge".

Based on this article and my understanding, squash merging turns the PR into a single commit SHA and causes the commit SHA information from the upstream csstree/csstree to be lost, so the "This branch is 106 commits ahead of and 23 commits behind csstree/csstree:master" information would not be resolved.

I'm not 100% sure, so it would be helpful to double-check the information above. But, if the description is correct, merging the commits edb0e59, 3c30ab1, and 99394e8 into a single commit would be helpful, since a "Merge commit" will retain those commits on the main branch as-is.

@nzakas
Copy link
Copy Markdown
Member

nzakas commented Mar 18, 2026

@lumirlumir I think you're correct, I'm just not sure it's worth the trouble of squashing three commits and the merging the rest just to get the GitHub numbers to line up. I think as long as we have a commit that says "syncing with upstream csstree vx.y.z", that should be good enough for our needs.

Copy link
Copy Markdown
Member

@lumirlumir lumirlumir left a comment

Choose a reason for hiding this comment

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

If it's acceptable not to squash the three commits into a single commit, I'm fine with that.

Changes LGTM. Please merge this PR once everything is ready, as I don't have permission to use "Merge commits".

@lumirlumir lumirlumir moved this from Second Review Needed to Merge Candidates in Triage Mar 19, 2026
@nzakas nzakas changed the title fix: sync with upstream csstree fix: sync with upstream csstree v3.2.1 Mar 20, 2026
@nzakas nzakas merged commit b3f6484 into eslint:main Mar 20, 2026
22 checks passed
@github-project-automation github-project-automation Bot moved this from Merge Candidates to Complete in Triage Mar 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

accepted bug Something isn't working

Projects

Status: Complete

Development

Successfully merging this pull request may close these issues.

Change Request: Add list option for parser

10 participants