Skip to content
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.

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

Fix adapter-cloudflare-workers prerendering bug #4626

Merged
merged 8 commits into from
Apr 15, 2022
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix: prerendered page resolution
f5io committed Mar 31, 2022
commit bc2f013938c976a38cb2c2005e0afa703e0df087
2 changes: 1 addition & 1 deletion packages/adapter-cloudflare-workers/ambient.d.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ declare module 'MANIFEST' {
import { SSRManifest } from '@sveltejs/kit';

export const manifest: SSRManifest;
export const prerendered: Set<string>;
export const prerendered: Map<string, { file: string }>;
}

declare abstract class FetchEvent extends Event {
12 changes: 10 additions & 2 deletions packages/adapter-cloudflare-workers/files/entry.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Server } from 'SERVER';
import { manifest, prerendered } from 'MANIFEST';
import { getAssetFromKV } from '@cloudflare/kv-asset-handler';
import { getAssetFromKV, mapRequestToAsset } from '@cloudflare/kv-asset-handler';

const server = new Server(manifest);

@@ -45,7 +45,15 @@ async function handle(event) {
manifest.assets.has(file + '/index.html') ||
prerendered.has(pathname || '/')
) {
return await getAssetFromKV(event);
return await getAssetFromKV(event, {
mapRequestToAsset(request, options) {
if (prerendered.has(pathname || '/')) {
url.pathname = '/' + prerendered.get(pathname || '/').file;
return new Request(url.toString(), request);
}
return mapRequestToAsset(request, options);
}
});
}

// dynamically-generated pages
4 changes: 3 additions & 1 deletion packages/adapter-cloudflare-workers/index.js
Original file line number Diff line number Diff line change
@@ -46,7 +46,9 @@ export default function (options = {}) {
`${tmp}/manifest.js`,
`export const manifest = ${builder.generateManifest({
relativePath
})};\n\nexport const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});\n`
})};\n\nexport const prerendered = new Map(${
JSON.stringify(Array.from(builder.prerendered.pages.entries()))
});\n`
);

await esbuild.build({