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) (CP: 24.6) #2979

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

ZheSun88
Copy link
Contributor

@ZheSun88 ZheSun88 commented 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

* 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]>
@ZheSun88 ZheSun88 requested review from platosha and Lodin and removed request for platosha December 10, 2024 13:09
@platosha platosha changed the title fix(file-router): allow routes with the same path (#2971) fix(file-router): allow routes with the same path (#2971) (CP: 24.6) 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.62%. Comparing base (72bcc04) to head (899882c).
Report is 1 commits behind head on 24.6.

Files with missing lines Patch % Lines
...e-router/src/runtime/RouterConfigurationBuilder.ts 89.47% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             24.6    #2979      +/-   ##
==========================================
- Coverage   92.71%   92.62%   -0.09%     
==========================================
  Files          84       84              
  Lines        3156     3159       +3     
  Branches      769      770       +1     
==========================================
  Hits         2926     2926              
- Misses        179      182       +3     
  Partials       51       51              
Flag Coverage Δ
unittests 92.62% <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.

@platosha platosha enabled auto-merge (squash) December 10, 2024 13:22
@platosha platosha merged commit 3c19199 into 24.6 Dec 10, 2024
13 of 15 checks passed
@platosha platosha deleted the pick-2971 branch December 10, 2024 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants