Merge stable into main #1996
Merged
Merge stable into main #1996
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… consumer app & remove ember-cli-eslint
…able Update `fast-sourcemap-concat` to remove dependency `lodash.template` for consumer apps (security vulnerability)
Prepare Release
It's a bug that most of the MacrosConfig state is synchronized between copies of @embroider/macros but the globalConfigs object is not.
update node to latest LTS for CI
MacrosConfig should sync globalConfigs between copies
Prepare Release
# Conflicts: # .release-plan.json # packages/core/package.json # packages/macros/src/macros-config.ts # pnpm-lock.yaml
Update typescript and fix issues with Typescript 5.5
# Conflicts: # package.json # pnpm-lock.yaml
|
looks like you also need the windows fix https://github.com/embroider-build/embroider/pull/1855/files#diff-b803fcb7f17ed9235f1e5cb1fcd2f5d3b2838429d4368ae4c57ce4436577f03f |
|
@patricklx any idea why we might be hitting this now? what changed? |
|
I've added @patricklx 's change because I tested this locally and wasn't able to re-create the issue 🫠 If this fixes CI we can just merge it and move on, Windows shouldn't be blocking our process like this 😭 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.