Updates the dev server to handle multiple routes matching the same URL #4087
Conversation
🦋 Changeset detectedLatest commit: 03a253e The changes in this PR will be included in the next version bump. This PR includes changesets to release 12 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
github-actions
bot
added
the
pkg: astro
|
Likely related to #3809 as well, dev routing should prioritize injected routes above all |
…ro/astro into fix/dev-dynamic-routing-priority
tony-sull
changed the title
| @@ -159,6 +159,29 @@ function comparator(a: Item, b: Item) { | |||
| return a.file < b.file ? -1 : 1; | |||
| } | |||
|
|
|||
| function injectedRouteToItem( | |||
There was a problem hiding this comment.
This is used to sort injected routes with the same comparer used for user-defined routes
| @@ -4,3 +4,8 @@ import type { ManifestData, RouteData } from '../../@types/astro'; | |||
| export function matchRoute(pathname: string, manifest: ManifestData): RouteData | undefined { | |||
| return manifest.routes.find((route) => route.pattern.test(pathname)); | |||
| } | |||
|
|
|||
| /** Finds all matching routes from pathname */ | |||
| export function matchAllRoutes(pathname: string, manifest: ManifestData): RouteData[] { | |||
There was a problem hiding this comment.
used by the dev server to find all potential routes for the requested URL
| const filePath = new URL(`./${maybeRoute.component}`, config.root); | ||
| const preloadedComponent = await preload({ astroConfig: config, filePath, viteServer }); | ||
| const [, mod] = preloadedComponent; | ||
| // attempt to get static paths |
There was a problem hiding this comment.
does this result in getStaticPaths being called more than once?
There was a problem hiding this comment.
It's still only called once. The getStaticPaths() result is always cached even if the params don't match
Just noticed we have a test to make sure it's only called once but that test only covers build. I just pushed up a test that checks that for dev as well 👍
Closes #3809
Changes
dev server now finds all page templates that match the requested URL and checks each one in priority order
astro devastro buildinjected routes are now sorted with a higher priority than all user-provided page routes
Testing
routing-prioritytests passDocs
N/A bug fix only