michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: exclude redirects when running functionPerRoute (#8320)

Browse source 
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
This commit is contained in:
Emanuele Stoppa 2023-08-31 18:34:50 +01:00 • committed by GitHub
parent 5f3a44aeef
commit b21038c193
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/gorgeous-dogs-speak.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Exclude redirects from split entry points

5
packages/astro/src/core/build/plugins/plugin-ssr.ts
View file

@ -148,7 +148,10 @@ function vitePluginSSRSplit(
if (options.settings.config.build.split || functionPerRouteEnabled) { if (options.settings.config.build.split || functionPerRouteEnabled) {
const inputs = new Set<string>(); const inputs = new Set<string>();
for (const path of Object.keys(options.allPages)) { for (const [path, pageData] of Object.entries(options.allPages)) {
if (routeIsRedirect(pageData.route)) {
continue;
}
inputs.add(getVirtualModulePageNameFromPath(SPLIT_MODULE_ID, path)); inputs.add(getVirtualModulePageNameFromPath(SPLIT_MODULE_ID, path));
} }

10
packages/astro/test/fixtures/ssr-split-manifest/astro.config.mjs vendored
View file

@ -1,7 +1,7 @@
import { defineConfig } from 'astro/config'; import { defineConfig } from 'astro/config';
export default defineConfig({ export default defineConfig({
build: { output: "server",
split: true redirects: {
}, "/redirect": "/"
output: "server" }
}) })

2
packages/astro/test/fixtures/ssr-split-manifest/src/pages/index.astro vendored
View file

@ -11,7 +11,7 @@ import { manifest } from 'astro:ssr-manifest';
</style> </style>
</head> </head>
<body> <body>
<h1>Testing</h1> <h1>Testing index</h1>
<div id="assets" set:html={JSON.stringify([...manifest.assets])}></div> <div id="assets" set:html={JSON.stringify([...manifest.assets])}></div>
</body> </body>
</html> </html>

41
packages/astro/test/ssr-split-manifest.test.js
View file

@ -25,6 +25,11 @@ describe('astro:ssr-manifest, split', () => {
setRoutes(routes) { setRoutes(routes) {
currentRoutes = routes; currentRoutes = routes;
}, },
extendAdapter: {
adapterFeatures: {
functionPerRoute: true,
},
},
}), }),
// test suite was authored when inlineStylesheets defaulted to never // test suite was authored when inlineStylesheets defaulted to never
build: { inlineStylesheets: 'never' }, build: { inlineStylesheets: 'never' },
@ -70,4 +75,40 @@ describe('astro:ssr-manifest, split', () => {
const html = await response.text(); const html = await response.text();
expect(html.includes('<title>Pre render me</title>')).to.be.true; expect(html.includes('<title>Pre render me</title>')).to.be.true;
}); });
describe('when function per route is enabled', async () => {
before(async () => {
fixture = await loadFixture({
root: './fixtures/ssr-split-manifest/',
output: 'server',
adapter: testAdapter({
setEntryPoints(entries) {
if (entries) {
entryPoints = entries;
}
},
setRoutes(routes) {
currentRoutes = routes;
},
extendAdapter: {
adapterFeatures: {
functionPerRoute: true,
},
},
}),
// test suite was authored when inlineStylesheets defaulted to never
build: { inlineStylesheets: 'never' },
});
await fixture.build();
});
it('should correctly build, and not create a "uses" entry point', async () => {
const pagePath = 'src/pages/index.astro';
const app = await fixture.loadEntryPoint(pagePath, currentRoutes);
const request = new Request('http://example.com/');
const response = await app.render(request);
const html = await response.text();
console.log(html);
expect(html.includes('<title>Testing</title>')).to.be.true;
});
});
}); });