Skip to content
Open
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/deep-spies-end.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Populates styles in the SSR manifest for prerendered routes. Previously, prerendered routes had `styles: []` in the manifest, making it impossible for workers or middleware to discover which CSS files a prerendered page uses.
2 changes: 1 addition & 1 deletion .github/workflows/preview-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Preview release

on:
pull_request:
branches: [main]
branches: [main, 5-legacy]
types: [labeled]

concurrency:
Expand Down
12 changes: 11 additions & 1 deletion packages/astro/src/core/build/plugins/plugin-manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,21 @@ async function buildManifest(
const outFolder = getOutFolder(opts.settings, route.pathname, route);
const outFile = getOutFile(opts.settings.config, outFolder, route.pathname, route);
const file = outFile.toString().replace(opts.settings.config.build.client.toString(), '');

const pageData = internals.pagesByKeys.get(makePageDataKey(route.route, route.component));
const styles = pageData
? pageData.styles
.sort(cssOrder)
.map(({ sheet }) => sheet)
.map((s) => (s.type === 'external' ? { ...s, src: prefixAssetPath(s.src) } : s))
.reduce(mergeInlineCss, [])
: [];

routes.push({
file,
links: [],
scripts: [],
styles: [],
styles,
routeData: serializeRouteData(route, settings.config.trailingSlash),
});
staticFiles.push(file);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
export const prerender = true;
import '../styles/global.css';
---

<html>
<head><title>Prerendered</title></head>
<body><p>Hello</p></body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
body { color: red; }
12 changes: 12 additions & 0 deletions packages/astro/test/ssr-manifest.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@ describe('astro:ssr-manifest', () => {
assert.equal(app.manifest.compressHTML, true);
});

it('includes styles for prerendered routes in manifest', async () => {
const app = await fixture.loadTestAdapterApp();
const prerenderedRoute = app.manifest.routes.find(
(route) => route.routeData.route === '/prerendered',
);
assert.ok(prerenderedRoute, 'prerendered route should be in manifest');
assert.ok(
prerenderedRoute.styles.length > 0,
'prerendered route should have styles in manifest',
);
});

it('includes correct routes', async () => {
const app = await fixture.loadTestAdapterApp();
// NOTE: `app.manifest` is actually a private property
Expand Down
Loading