Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/curly-mails-lie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix dev routing for `server:defer` islands when adapters opt into handling prerendered routes in Astro core. Server island requests are now treated as prerender-handler eligible so prerendered pages using `prerenderEnvironment: 'node'` can load island content without `400` errors.
4 changes: 2 additions & 2 deletions packages/astro/src/vite-plugin-astro-server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { AstroError, AstroErrorData } from '../core/errors/index.js';
import type { Logger } from '../core/logger/core.js';
import { NOOP_MIDDLEWARE_FN } from '../core/middleware/noop-middleware.js';
import { createViteLoader } from '../core/module-loader/index.js';
import { matchAllRoutes } from '../core/routing/match.js';
import { isRouteServerIsland, matchAllRoutes } from '../core/routing/match.js';
import { resolveMiddlewareMode } from '../integrations/adapter-utils.js';
import { SERIALIZED_MANIFEST_ID } from '../manifest/serialized.js';
import type { AstroSettings } from '../types/astro.js';
Expand Down Expand Up @@ -176,7 +176,7 @@ export default function createVitePluginAstroServer({
const routesList = { routes: routes.map((r: any) => r.routeData) };
const matches = matchAllRoutes(pathname, routesList);

if (!matches.some((route) => route.prerender)) {
if (!matches.some((route) => route.prerender || isRouteServerIsland(route))) {
return next();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p id="deferred-content">deferred island content</p>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export const prerender = true;

import fs from 'node:fs';
import path from 'node:path';
import DeferredIsland from '../components/DeferredIsland.astro';

const packageJsonPath = path.join(process.cwd(), 'package.json');
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
Expand All @@ -20,5 +21,8 @@ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
<body>
<h1>Prerendered</h1>
<p id="pkg-name">{packageJson.name}</p>
<DeferredIsland server:defer>
<p slot="fallback" id="deferred-fallback">loading...</p>
</DeferredIsland>
</body>
</html>
21 changes: 21 additions & 0 deletions packages/integrations/cloudflare/test/prerender-node-env.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,27 @@ describe('prerenderEnvironment: node', () => {
);
});

it('serves server islands for prerendered routes in dev', async () => {
const res = await fixture.fetch('/');
assert.equal(res.status, 200);
const html = await res.text();
assert.ok(
html.includes('id="deferred-fallback"'),
'Expected fallback content in prerendered HTML',
);

const islandUrlMatch = html.match(/fetch\('(\/_server-islands\/[^']+)'/);
assert.ok(islandUrlMatch, 'Expected prerendered HTML to include a server island fetch URL');

const islandRes = await fixture.fetch(islandUrlMatch[1]);
assert.equal(islandRes.status, 200, 'Expected server island endpoint to return 200 in dev');
const islandHtml = await islandRes.text();
assert.ok(
islandHtml.includes('id="deferred-content"'),
'Expected server island response to include deferred island content',
);
});

it('renders SSR page through workerd with Astro.request.cf', async () => {
const res = await fixture.fetch('/ssr');
assert.equal(res.status, 200);
Expand Down
16 changes: 8 additions & 8 deletions packages/language-tools/language-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
"@volar/language-service": "~2.4.28",
"muggle-string": "^0.4.1",
"tinyglobby": "^0.2.15",
"volar-service-css": "0.0.68",
"volar-service-emmet": "0.0.68",
"volar-service-html": "0.0.68",
"volar-service-prettier": "0.0.68",
"volar-service-typescript": "0.0.68",
"volar-service-typescript-twoslash-queries": "0.0.68",
"volar-service-yaml": "0.0.68",
"vscode-html-languageservice": "^5.6.1",
"volar-service-css": "0.0.70",
"volar-service-emmet": "0.0.70",
"volar-service-html": "0.0.70",
"volar-service-prettier": "0.0.70",
"volar-service-typescript": "0.0.70",
"volar-service-typescript-twoslash-queries": "0.0.70",
"volar-service-yaml": "0.0.70",
"vscode-html-languageservice": "^5.6.2",
"vscode-uri": "^3.1.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe(

assert.deepStrictEqual(hover?.contents, {
kind: 'markdown',
value: "The blog post's title\\.",
value: "The blog post's title.",
});
});
},
Expand Down
2 changes: 1 addition & 1 deletion packages/language-tools/language-server/test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"svelte": "^5.51.5"
"svelte": "^5.53.8"
},
"devDependencies": {
"tinyglobby": "^0.2.15"
Expand Down
Loading
Loading