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.

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

feat: append prerendered redirects to _redirects file #12199

Merged
merged 6 commits into from
Jul 23, 2024
Merged

feat: append prerendered redirects to _redirects file #12199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2c0dd0
feat: Generate static _routes in Cloudflare adapter
Zhincore May 8, 2024
5f22bd7
Update .changeset/ten-shirts-add.md
benmccann Jun 21, 2024
74737f8
fix: add comements and newline in generated _redirects file
Zhincore Jul 1, 2024
b6abc2e
fix: exclude redirect paths from cloudflare
Zhincore Jul 1, 2024
e428e4b
fix: check if there are redirects before writing
Zhincore Jul 5, 2024
be8b4bb
Fix formatting
Zhincore Jul 14, 2024
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/ten-shirts-add.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@sveltejs/adapter-cloudflare": minor
---

feat: generate static `_redirects` for Cloudflare Pages
29 changes: 21 additions & 8 deletions packages/adapter-cloudflare/index.js
View file
Open in desktop
Zhincore marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ export default function (options = {}) {

writeFileSync(`${dest}/_headers`, generate_headers(builder.getAppPath()), { flag: 'a' });

if (builder.prerendered.redirects.size > 0) {
writeFileSync(`${dest}/_redirects`, generate_redirects(builder.prerendered.redirects), {
flag: 'a'
});
}

builder.copy(`${files}/worker.js`, `${tmp}/_worker.js`, {
replace: {
SERVER: `${relativePath}/index.js`,
Expand Down Expand Up @@ -197,14 +203,7 @@ function get_routes_json(builder, assets, { include = ['/*'], exclude = ['<all>'
}

if (rule === '<prerendered>') {
const prerendered = [];
for (const path of builder.prerendered.paths) {
if (!builder.prerendered.redirects.has(path)) {
prerendered.push(path);
}
}

return prerendered;
return builder.prerendered.paths;
}

return rule;
Expand Down Expand Up @@ -239,3 +238,17 @@ function generate_headers(app_dir) {
# === END AUTOGENERATED SVELTE IMMUTABLE HEADERS ===
`.trimEnd();
}

/** @param {Map<string, { status: number; location: string }>} redirects */
function generate_redirects(redirects) {
const rules = Array.from(
redirects.entries(),
([path, redirect]) => `${path} ${redirect.location} ${redirect.status}`
).join('\n');

return `
# === START AUTOGENERATED SVELTE PRERENDERED REDIRECTS ===
${rules}
# === END AUTOGENERATED SVELTE PRERENDERED REDIRECTS ===
`.trimEnd();
}
Loading