Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stable into main #1980

Closed
wants to merge 20 commits into from
Closed

Merge stable into main #1980

wants to merge 20 commits into from

Conversation

NullVoxPopuli
Copy link
Collaborator

No description provided.

ef4 and others added 16 commits June 11, 2024 10:14
This was dropped at ember 5.0 but [accidentally worked](emberjs/ember.js#20694) until 5.9.
Stop using "#with" in macro tests
This bug was lurking since #1858 but it didn't actually cause a test failure until an updated glimmer-vm landed. Not entirely sure why that was, but the bug is definitely real and this is the appropriate fix.
…ess-modifier

Fix modifier removal for "unless (macroCondition ...)"
DEPRECATION: The parts property on path nodes is deprecated, use head and tail instead
DEPRECATION: The 'Program' visitor node is deprecated. Use 'Template' or 'Block' instead (node was 'Template')
DEPRECATION: The parts property on path nodes is deprecated, use head and tail instead
DEPRECATION: The 'Program' visitor node is deprecated. Use 'Template' or 'Block' instead (node was 'Template')
DEPRECATION: The 'Program' visitor node is deprecated. Use 'Template' or 'Block' instead (node was 'Template')
DEPRECATION: The 'Program' visitor node is deprecated. Use 'Template' or 'Block' instead (node was 'Template')
DEPRECATION: The 'Program' visitor node is deprecated. Use 'Template' or 'Block' instead (node was 'Template')
…m-ember-source-5.9-@glimmer/syntax-0.92

Address these issues in new apps (5.9):
@ef4 ef4 marked this pull request as ready for review June 11, 2024 19:28
@mansona
Copy link
Member

mansona commented Jun 12, 2024

When you're doing this merge you need to resolve conflicts as part of the merge commit: #1983

If you look at that branch in a visual editor it will give you an idea of what I did differently 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants