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

Add support for {{unless}} to the macroCondition macro #1858

Conversation

Windvis
Copy link
Collaborator

@Windvis Windvis commented Mar 28, 2024

I noticed the macroCondition macro could only be used with the {{if}} helper / keyword. This change makes it possible to use {{unless}} as well.

(Not a very DRY change, but it seemed better to keep things simple and duplicate the if version 😄.)

Copy link
Contributor

@ef4 ef4 left a comment

Choose a reason for hiding this comment

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

Thanks, this looks nice.

@Windvis Windvis force-pushed the macros/macroCondition-unless-keyword-support branch from 32374bd to a1310c8 Compare March 28, 2024 14:53
@Windvis Windvis added enhancement New feature or request and removed enhancement New feature or request labels Mar 28, 2024
@Windvis
Copy link
Collaborator Author

Windvis commented Apr 16, 2024

@ef4 is there anything that needs to happen before this can be merged or did this simply fall through the cracks 😄?

@mansona
Copy link
Member

mansona commented Apr 16, 2024

@Windvis one thing that might be slowing this down is that you're targeting main with this change 🤔 are you intending to make use of this soon? main isn't going to be released any time soon and there are a lot of breaking changes, if you want to use this soon then I would target stable

@Windvis
Copy link
Collaborator Author

Windvis commented Apr 16, 2024

@mansona No, there is no rush since it's easy to work around the issue.

If I target stable, how does the change get back into main? Does it get cherry picked, or do I need to open a second PR that targets main?

@mansona
Copy link
Member

mansona commented Apr 16, 2024

@Windvis once things are released in stable we forward-port them to main. It tends to be a lot easier to do it this way, also since we're keeping things up to date often enough 👍

Essentially you would not need to do anything extra, it would be on us :)

@ef4
Copy link
Contributor

ef4 commented Apr 16, 2024

Let's try to retarget this to stable, @mansona has volunteered, it looks like it will apply cleanly.

@mansona mansona changed the base branch from main to stable April 17, 2024 09:08
@mansona mansona force-pushed the macros/macroCondition-unless-keyword-support branch from a1310c8 to 6d2baff Compare April 17, 2024 09:08
@mansona mansona added the enhancement New feature or request label Apr 17, 2024
@mansona mansona merged commit a10ef00 into embroider-build:stable Apr 17, 2024
203 checks passed
@github-actions github-actions bot mentioned this pull request Apr 16, 2024
ef4 added a commit that referenced this pull request Jun 11, 2024
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants