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

fix(file-router): preserve empty children for layout routes #2572

Merged
merged 1 commit into from
Jun 24, 2024

Conversation

platosha
Copy link
Contributor

Fixes #2571

@platosha platosha added hilla Issues related to Hilla target/main labels Jun 24, 2024
Copy link

sonarcloud bot commented Jun 24, 2024

@platosha platosha requested a review from Lodin June 24, 2024 15:36
Copy link

codecov bot commented Jun 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (24.4@2d8a6a7). Learn more about missing BASE report.

Additional details and impacted files
@@           Coverage Diff           @@
##             24.4    #2572   +/-   ##
=======================================
  Coverage        ?   95.01%           
=======================================
  Files           ?       66           
  Lines           ?     4557           
  Branches        ?      664           
=======================================
  Hits            ?     4330           
  Misses          ?      182           
  Partials        ?       45           
Flag Coverage Δ
unittests 95.01% <100.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Lodin Lodin merged commit c9189df into 24.4 Jun 24, 2024
15 checks passed
@Lodin Lodin deleted the fix/24.4/2571 branch June 24, 2024 19:17
@vaadin-bot
Copy link
Collaborator

Hi @platosha and @Lodin, when i performed cherry-pick to this commit to main, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick c9189df
error: could not apply c9189df... fix(file-router): preserve empty children for layout routes (#2572)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

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

Successfully merging this pull request may close these issues.

3 participants