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: remove base url before calculating route rules #767

Merged
merged 1 commit into from
Dec 20, 2022
Merged

Conversation

danielroe
Copy link
Member

πŸ”— Linked issue

nuxt/nuxt#15610

❓ Type of change

  • πŸ“– Documentation (updates to the documentation or readme)
  • 🐞 Bug fix (a non-breaking change that fixes an issue)
  • πŸ‘Œ Enhancement (improving an existing functionality like performance)
  • ✨ New feature (a non-breaking change that adds functionality)
  • ⚠️ Breaking change (fix or feature that would cause existing functionality to change)

πŸ“š Description

This PR removes baseURL before calculating route rules.

πŸ“ Checklist

  • I have linked an issue or discussion.
  • I have updated the documentation accordingly.

@danielroe danielroe added the bug Something isn't working label Dec 19, 2022
@danielroe danielroe requested a review from pi0 December 19, 2022 15:14
@danielroe danielroe self-assigned this Dec 19, 2022
@@ -32,7 +33,7 @@ export function getRouteRules(event: H3Event): NitroRouteRules {
event.context._nitro = event.context._nitro || {};
if (!event.context._nitro.routeRules) {
const path = new URL(event.req.url, "http://localhost").pathname;
event.context._nitro.routeRules = getRouteRulesForPath(path);
event.context._nitro.routeRules = getRouteRulesForPath(withoutBase(path, useRuntimeConfig().app.baseURL));
Copy link
Member

Choose a reason for hiding this comment

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

I'm wondering if we should do this directly inside getRouteRulesForPath?

Copy link
Member Author

Choose a reason for hiding this comment

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

I felt it was more natural here as we have access to event; getRouteRulesForPath feels like more of a 'pure' function. Also, looking at usage, it is used with an already normalised url, meaning if we move this there we are likely to double-remove a baseURL:

https://github.com/unjs/nitropack/blob/6541373545ee2716566bce46c7568ad2c3164cdf/src/runtime/app.ts#L58-L60

@pi0 pi0 merged commit 03a2bef into main Dec 20, 2022
@pi0 pi0 deleted the fix/base-route-rules branch December 20, 2022 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants