fix(ssr): correctly call the middleware when rendering error pages #8200
+81
−26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
github-actions
bot
added
the
pkg: astro
ematipico
commented
Aug 23, 2023
| @@ -12,6 +12,5 @@ export const RedirectComponentInstance: ComponentInstance = { | |||
|
|
|||
| export const RedirectSinglePageBuiltModule: SinglePageBuiltModule = { | |||
| page: () => Promise.resolve(RedirectComponentInstance), | |||
| onRequest: (ctx, next) => next(), | |||
There was a problem hiding this comment.
As you can see, there's no need for this stub anymore.
ematipico
commented
Aug 23, 2023
| @@ -245,6 +250,7 @@ function buildManifest( | |||
| clientDirectives: Array.from(settings.clientDirectives), | |||
| entryModules, | |||
| assets: staticFiles.map(prefixAssetPath), | |||
| middlewareEntryPoint: internals.middlewareEntryPoint?.toString() ?? undefined, | |||
There was a problem hiding this comment.
We saved the entry point in the SSR manifest, as it was a route.
matthewp
reviewed
Aug 23, 2023
lilnasy
reviewed
Aug 23, 2023
ematipico
force-pushed
the
fix/middleware-error-2-plt-832
branch
from
5f5de60 to
1c6ad96
Compare
ematipico
force-pushed
the
fix/middleware-error-2-plt-832
branch
2 times, most recently
from
c67f4c5 to
6c76466
Compare
matthewp
approved these changes
Aug 24, 2023
ematipico
force-pushed
the
fix/middleware-error-2-plt-832
branch
from
6c76466 to
7715cb6
Compare
This was referenced Aug 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Closes #8154
This fix goes into
nextbecause it requires some infrastructure that we have there but not inmain.This PR removes the
onRequestfunction from the "ComponentInstance", instead we move its resolution inside the pipeline. The middleware now becomes 100% detached from a page/route.This change fits perfectly because the SSR build already creates a
middleware.mjsfile, and we already save themiddlewareEntryPointfile.Testing
I created a new test case.
Docs
N/A