Skip to content

Cloudflare Adapter + Prerendered Function + SSR resolution attempt #15037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alecbakholdin wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −15
Open

Cloudflare Adapter + Prerendered Function + SSR resolution attempt #15037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/kit/src/runtime/app/server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ export function read(asset) {
const file = decodeURIComponent(
DEV && asset.startsWith('/@fs') ? asset : asset.slice(base.length + 1)
);
const fileAsRoute = file.replace(/^\/?/, '/');

if (file in manifest._.server_assets) {
if (file in manifest._.server_assets || manifest._.prerendered_routes.has(fileAsRoute)) {
const length = manifest._.server_assets[file];
const type = manifest.mimeTypes[file.slice(file.lastIndexOf('.'))];

Expand Down
24 changes: 10 additions & 14 deletions packages/kit/src/runtime/app/server/remote/prerender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
parse_remote_response,
run_remote_function
} from './shared.js';
import { read } from '$app/server';

/**
* Creates a remote prerender function. When called from the browser, the function will be invoked on the server via a `fetch` call.
Expand Down Expand Up @@ -103,23 +104,18 @@ export function prerender(validate_or_fn, fn_or_options, maybe_options) {

// TODO adapters can provide prerendered data more efficiently than
// fetching from the public internet
const promise = (cache[key] ??= fetch(new URL(url, event.url.origin).href).then(
async (response) => {
if (!response.ok) {
throw new Error('Prerendered response not found');
}
const response = (cache[key] ??= read(url));
if (!response.ok) {
throw new Error('Prerendered response not found');
}

const prerendered = await response.json();
const prerendered = await response.json();

if (prerendered.type === 'error') {
error(prerendered.status, prerendered.error);
}
if (prerendered.type === 'error') {
error(prerendered.status, prerendered.error);
}

return prerendered.result;
}
));

return parse_remote_response(await promise, state.transport);
return parse_remote_response(prerendered.result, state.transport);
});
} catch {
// not available prerendered, fallback to normal function
Expand Down
Loading