Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

fix(middleware): load while retrieving ssr manifest for prerendering (#9938)

Browse source 
* fix(middleware): load while retrieving ssr manifest for prerendering

* add test

* add changeset
This commit is contained in:
Arsh 2024-02-01 21:46:42 +00:00 • committed by GitHub
parent 055bd27d9d
commit 1568afb78a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/shaggy-sloths-mix.md Normal file
View file

@ -0,0 +1,5 @@
---
"astro": patch
---
Fixes a regression where middleware did not run for prerendered pages and endpoints.

8
packages/astro/src/core/build/buildPipeline.ts
View file

@ -125,6 +125,13 @@ export class BuildPipeline extends Pipeline {
const renderersEntryUrl = new URL(`renderers.mjs?time=${Date.now()}`, baseDirectory);
const renderers = await import(renderersEntryUrl.toString());
const middleware = await import(new URL('middleware.mjs', baseDirectory).toString())
.then((mod) => mod.onRequest)
// middleware.mjs is not emitted if there is no user middleware
// in which case the import fails with ERR_MODULE_NOT_FOUND, and we fall back to a no-op middleware
.catch(() => manifest.middleware);
if (!renderers) {
throw new Error(
"Astro couldn't find the emitted renderers. This is an internal error, please file an issue."
@ -133,6 +140,7 @@ export class BuildPipeline extends Pipeline {
return {
...manifest,
renderers: renderers.renderers as SSRLoadedRenderer[],
middleware
};
}

2
packages/astro/test/fixtures/middleware space/src/middleware.js vendored
View file

@ -40,6 +40,8 @@ const first = defineMiddleware(async (context, next) => {
status: 200,
headers: response.headers,
});
} else if (context.url.pathname === '/prerendered/') {
context.locals.canBeReadDuringPrerendering = "yes they can!";
} else {
if (context.url.pathname === '/') {
context.cookies.set('foo', 'bar');

4
packages/astro/test/fixtures/middleware space/src/pages/prerendered.astro vendored Normal file
View file

@ -0,0 +1,4 @@
---
export const prerender = true
---
<p>{Astro.locals.canBeReadDuringPrerendering}</p>

5
packages/astro/test/middleware.test.js
View file

@ -278,6 +278,11 @@ describe('Middleware API in PROD mode, SSR', () => {
expect(response.headers.get('content-type')).equal('text/html');
});
it('can set locals for prerendered pages to use', async () => {
const text = await fixture.readFile("/client/prerendered/index.html")
expect(text.includes('<p>yes they can!</p>')).to.be.true;
})
// keep this last
it('the integration should receive the path to the middleware', async () => {
fixture = await loadFixture({