Skip to content

fix(compiler): add more specific matcher for hydrate never block#58360

Closed
brandonroberts wants to merge 3 commits intoangular:mainfrom
brandonroberts:fix-hydrate-never
Closed

fix(compiler): add more specific matcher for hydrate never block#58360
brandonroberts wants to merge 3 commits intoangular:mainfrom
brandonroberts:fix-hydrate-never

Conversation

@brandonroberts
Copy link
Copy Markdown
Contributor

@brandonroberts brandonroberts commented Oct 25, 2024 •
edited
Loading

PR Checklist

Please check if your PR fulfills the following requirements:

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • angular.dev application / infrastructure changes
  • Other... Please describe:

What is the current behavior?

Issue Number: #58358

What is the new behavior?

No additional characters are allowed in the "hydrate never" block.

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

@pullapprove pullapprove bot requested a review from devversion October 25, 2024 14:24
@angular-robot angular-robot bot added the area: compiler Issues related to `ngc`, Angular's template compiler label Oct 25, 2024
@ngbot ngbot bot added this to the Backlog milestone Oct 25, 2024
@devversion devversion added action: review The PR is still awaiting reviews from at least one requested reviewer target: patch This PR is targeted for the next patch release labels Oct 25, 2024
@angular-robot angular-robot bot added area: compiler Issues related to `ngc`, Angular's template compiler and removed area: compiler Issues related to `ngc`, Angular's template compiler labels Oct 25, 2024
@ngbot ngbot bot modified the milestone: Backlog Oct 25, 2024
thePunderWoman
thePunderWoman approved these changes Oct 25, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@thePunderWoman thePunderWoman left a comment

Choose a reason for hiding this comment

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

LGTM, never, and thank you 🥚

@thePunderWoman thePunderWoman added action: merge The PR is ready for merge by the caretaker merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note and removed action: review The PR is still awaiting reviews from at least one requested reviewer labels Oct 25, 2024
@thePunderWoman
Copy link
Copy Markdown
Contributor

thePunderWoman commented Oct 25, 2024

Caretaker note: the broken adev tests are broken at head and unrelated to this change. This is safe to merge.

thePunderWoman
thePunderWoman requested changes Oct 25, 2024
View reviewed changes
Comment thread packages/compiler/src/render3/r3_deferred_blocks.ts Outdated
Copy link
Copy Markdown
Contributor

@thePunderWoman thePunderWoman Oct 25, 2024

Choose a reason for hiding this comment

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

On second look, it's entirely possible someone would put things after hydrate never, like a prefetch trigger or even a regular trigger, for example. So I don't think this will solve this issue.

Copy link
Copy Markdown
Contributor

@thePunderWoman thePunderWoman Oct 25, 2024

Choose a reason for hiding this comment

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

Additional test cases to consider (we've seen stuff like this before):

@defer(
  on idle;
  hydrate never
)

@defer(hydrate never; on idle;)

@defer(hydrate never ; on idle ;)

Copy link
Copy Markdown
Contributor Author

@brandonroberts brandonroberts Oct 25, 2024

Choose a reason for hiding this comment

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

Good catch. Updated the expression to allow only additional spaces and added some additional tests

@thePunderWoman thePunderWoman added action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews and removed action: merge The PR is ready for merge by the caretaker labels Oct 25, 2024
@angular-robot angular-robot bot added area: compiler Issues related to `ngc`, Angular's template compiler and removed area: compiler Issues related to `ngc`, Angular's template compiler labels Oct 25, 2024
thePunderWoman
thePunderWoman approved these changes Oct 25, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@thePunderWoman thePunderWoman left a comment

Choose a reason for hiding this comment

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

Thanks for the additional tests!

@thePunderWoman
Copy link
Copy Markdown
Contributor

thePunderWoman commented Oct 25, 2024

@brandonroberts Can you rebase on main? That should fix the broken adev tests.

@angular-robot angular-robot bot added area: compiler Issues related to `ngc`, Angular's template compiler and removed area: compiler Issues related to `ngc`, Angular's template compiler labels Oct 25, 2024
@ngbot ngbot bot removed this from the Backlog milestone Oct 25, 2024
@ngbot ngbot bot added this to the Backlog milestone Oct 25, 2024
@brandonroberts
Copy link
Copy Markdown
Contributor Author

brandonroberts commented Oct 25, 2024

@thePunderWoman yep, done

@thePunderWoman thePunderWoman added action: merge The PR is ready for merge by the caretaker target: rc This PR is targeted for the next release-candidate and removed action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release labels Oct 25, 2024
@alxhub
Copy link
Copy Markdown
Member

alxhub commented Oct 28, 2024

This PR was merged into the repository by commit 992410e.

The changes were merged into the following branches: main, 19.0.x

@alxhub alxhub closed this in 992410e Oct 28, 2024
alxhub pushed a commit that referenced this pull request Oct 28, 2024
@brandonroberts @alxhub
fix(compiler): add more specific matcher for hydrate never block (#58360
98804fd 
)

Fixes an issue where additional characters were allowed afte the "hydrate never" block.

Closes #58358

PR Close #58360
@angular-automatic-lock-bot
Copy link
Copy Markdown

angular-automatic-lock-bot bot commented Nov 28, 2024

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Nov 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@thePunderWoman thePunderWoman thePunderWoman approved these changes

@devversion devversion devversion approved these changes

Assignees

No one assigned

Labels

action: merge The PR is ready for merge by the caretaker area: compiler Issues related to `ngc`, Angular's template compiler target: rc This PR is targeted for the next release-candidate

Projects

None yet

Milestone

Backlog

Development

Successfully merging this pull request may close these issues.

4 participants

@brandonroberts @thePunderWoman @alxhub @devversion