Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-16 21:46:22 -05:00
Code Issues Activity

fix(middleware): don't import via entrypoint (#12707)

Browse source 
* fix(middleware): don't import via entrypoint

* fix(middleware): don't import via entrypoint
This commit is contained in:
Emanuele Stoppa 2024-12-10 20:48:38 +00:00 committed by GitHub
parent f6c4214042
commit 2aaed2d2a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 56 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/bright-crabs-kick.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes a bug where the middleware was incorrectly imported during the build

10
packages/astro/src/core/build/pipeline.ts
View file

@ -131,11 +131,11 @@ export class BuildPipeline extends Pipeline {
const renderers = await import(renderersEntryUrl.toString()); const renderers = await import(renderersEntryUrl.toString());
const middleware = internals.middlewareEntryPoint const middleware = internals.middlewareEntryPoint
? await import(internals.middlewareEntryPoint.toString()).then((mod) => { ? async function () {
return function () { // @ts-expect-error: the compiler can't understand the previous check
return { onRequest: mod.onRequest }; const mod = await import(internals.middlewareEntryPoint.toString());
}; return { onRequest: mod.onRequest };
}) }
: manifest.middleware; : manifest.middleware;
if (!renderers) { if (!renderers) {

8
packages/astro/test/fixtures/middleware-full-ssr/package.json vendored Normal file
View file

@ -0,0 +1,8 @@
{
"name": "@test/middleware-full-ssr",
"version": "0.0.0",
"private": true,
"dependencies": {
"astro": "workspace:*"
}
}

1
packages/astro/test/fixtures/middleware-full-ssr/src/error.js vendored Normal file
View file

@ -0,0 +1 @@
throw new Error("Shoud not error at build time")

2
packages/astro/test/fixtures/middleware-full-ssr/src/middleware.js vendored Normal file
View file

@ -0,0 +1,2 @@
import "./error.js"
export const onRequest = (_ , next) => next();

14
packages/astro/test/fixtures/middleware-full-ssr/src/pages/index.astro vendored Normal file
View file

@ -0,0 +1,14 @@
---
const data = Astro.locals;
---
<html>
<head>
<title>Testing</title>
</head>
<body>
<span>Index</span>
<p>{data?.name}</p>
</body>
</html>

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

@ -171,6 +171,21 @@ describe('Middleware in PROD mode, SSG', () => {
}); });
}); });
describe('Middleware should not be executed or imported during', () => {
/** @type {import('./test-utils').Fixture} */
let fixture;
it('should build the project without errors', async () => {
fixture = await loadFixture({
root: './fixtures/middleware-full-ssr/',
output: 'server',
adapter: testAdapter({}),
});
await fixture.build();
assert.ok('Should build');
});
});
describe('Middleware API in PROD mode, SSR', () => { describe('Middleware API in PROD mode, SSR', () => {
/** @type {import('./test-utils').Fixture} */ /** @type {import('./test-utils').Fixture} */
let fixture; let fixture;

6
pnpm-lock.yaml
View file

@ -3324,6 +3324,12 @@ importers:
specifier: workspace:* specifier: workspace:*
version: link:../../.. version: link:../../..
packages/astro/test/fixtures/middleware-full-ssr:
dependencies:
astro:
specifier: workspace:*
version: link:../../..
packages/astro/test/fixtures/middleware-no-user-middleware: packages/astro/test/fixtures/middleware-no-user-middleware:
dependencies: dependencies:
astro: astro: