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): allow routes with the same path #2971

Merged
merged 12 commits into from
Dec 10, 2024

Conversation

Lodin
Copy link
Contributor

@Lodin Lodin commented Dec 9, 2024

Fixes #2954.

@Lodin Lodin requested a review from platosha December 9, 2024 18:14
@platosha platosha marked this pull request as ready for review December 10, 2024 12:32
platosha
platosha previously approved these changes Dec 10, 2024
Copy link

sonarcloud bot commented Dec 10, 2024

Copy link

codecov bot commented Dec 10, 2024

Codecov Report

Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.

Project coverage is 92.52%. Comparing base (35aaded) to head (551221f).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...e-router/src/runtime/RouterConfigurationBuilder.ts 89.47% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2971      +/-   ##
==========================================
- Coverage   92.61%   92.52%   -0.09%     
==========================================
  Files          84       84              
  Lines        3156     3159       +3     
  Branches      769      770       +1     
==========================================
  Hits         2923     2923              
- Misses        181      184       +3     
  Partials       52       52              
Flag Coverage Δ
unittests 92.52% <89.47%> (-0.09%) ⬇️

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.

@ZheSun88 ZheSun88 merged commit 0a72e18 into main Dec 10, 2024
13 of 15 checks passed
@ZheSun88 ZheSun88 deleted the fix/file-router/missing-route-after-merge branch December 10, 2024 12:56
@vaadin-bot
Copy link
Collaborator

Hi @Lodin and @ZheSun88, when i performed cherry-pick to this commit to 24.6, i have encountered the following issue. Can you take a look and pick it manually?
Error Message:
Error: Command failed: git cherry-pick 0a72e18
error: could not apply 0a72e18... fix(file-router): allow routes with the same path (#2971)
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".

ZheSun88 pushed a commit that referenced this pull request Dec 10, 2024
* refactor(file-router): attempt to consider all routes with the same path

* refactor(file-router): allow elements with same path in the route list

* style(file-router): cleanup

* chore: update package-lock.json

* test(file-router): fix index fallback assertion

* chore: revert package-lock.json

* chore(file-router): remove extra dependency

* chore(generator-utils): remove unnecessary export

* chore: revert package-lock.json

* chore(file-router): do not bring old tests back

---------

Co-authored-by: Anton Platonov <[email protected]>
platosha added a commit that referenced this pull request Dec 10, 2024
…2979)

fix(file-router): allow routes with the same path (#2971)

* refactor(file-router): attempt to consider all routes with the same path

* refactor(file-router): allow elements with same path in the route list

* style(file-router): cleanup

* chore: update package-lock.json

* test(file-router): fix index fallback assertion

* chore: revert package-lock.json

* chore(file-router): remove extra dependency

* chore(generator-utils): remove unnecessary export

* chore: revert package-lock.json

* chore(file-router): do not bring old tests back

---------

Co-authored-by: Vlad Rindevich <[email protected]>
Co-authored-by: Anton Platonov <[email protected]>
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.

Login view not shown for /login
4 participants