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

Jump to bottom

feat: Add a speedier script tag for prerendered redirects #9911

Merged
merged 8 commits into from
May 16, 2023
Merged

feat: Add a speedier script tag for prerendered redirects #9911

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05a6d4f
feat: Add a script redirect to prerendered pages
elliott-with-the-longest-name-on-github May 12, 2023
17145b1
changeset
elliott-with-the-longest-name-on-github May 12, 2023
9afccef
Update .changeset/hungry-rocks-hunt.md
elliott-with-the-longest-name-on-github May 12, 2023
bb58e11
fix test
elliott-with-the-longest-name-on-github May 12, 2023
673a895
feat: Update string escaping
elliott-with-the-longest-name-on-github May 16, 2023
5b176dd
Merge remote-tracking branch 'origin' into elliott/9907-speeeeeeeed
elliott-with-the-longest-name-on-github May 16, 2023
c762d97
Merge remote-tracking branch 'origin' into elliott/9907-speeeeeeeed
elliott-with-the-longest-name-on-github May 16, 2023
b1af08e
Update .changeset/hungry-rocks-hunt.md
elliott-with-the-longest-name-on-github May 16, 2023
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/hungry-rocks-hunt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': minor
---

feat: add a speedier script for prerendered redirects
elliott-with-the-longest-name-on-github marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 5 additions & 1 deletion packages/kit/src/core/postbuild/prerender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,11 @@ async function prerender({ out, manifest_path, metadata, verbose, env }) {

writeFileSync(
dest,
`<meta http-equiv="refresh" content=${escape_html_attr(`0;url=${location}`)}>`
`<script>location.href="${encodeURI(
decodeURIComponent(location)
)}";</script><meta http-equiv="refresh" content=${escape_html_attr(
`0;url=${location}`
)}>`
);

written.add(file);
Expand Down
Empty file removed packages/kit/test/prerendering/basics/src/routes/redirect-encoded/+page.svelte
View file
Open in desktop
Empty file.
Empty file removed packages/kit/test/prerendering/basics/src/routes/redirect-malicious/+page.svelte
View file
Open in desktop
Empty file.
6 changes: 6 additions & 0 deletions packages/kit/test/prerendering/basics/src/routes/redirect-relative/+page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { redirect } from '@sveltejs/kit';

/** @type {import('@sveltejs/kit').Load} */
export function load() {
throw redirect(301, '/env');
}
Empty file removed packages/kit/test/prerendering/basics/src/routes/redirect-server/+page.svelte
View file
Open in desktop
Empty file.
Empty file removed packages/kit/test/prerendering/basics/src/routes/redirect/+page.svelte
View file
Open in desktop
Empty file.
19 changes: 15 additions & 4 deletions packages/kit/test/prerendering/basics/test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ test('renders a redirect', () => {
const content = read('redirect.html');
assert.equal(
content,
'<meta http-equiv="refresh" content="0;url=https://example.com/redirected">'
'<script>location.href="https://example.com/redirected";</script><meta http-equiv="refresh" content="0;url=https://example.com/redirected">'
);
});

test('renders a server-side redirect', () => {
const html = read('redirect-server.html');
assert.equal(html, '<meta http-equiv="refresh" content="0;url=https://example.com/redirected">');
assert.equal(
html,
'<script>location.href="https://example.com/redirected";</script><meta http-equiv="refresh" content="0;url=https://example.com/redirected">'
);

const data = JSON.parse(read('redirect-server/__data.json'));

Expand All @@ -37,15 +40,23 @@ test('does not double-encode redirect locations', () => {
const content = read('redirect-encoded.html');
assert.equal(
content,
'<meta http-equiv="refresh" content="0;url=https://example.com/redirected?returnTo=%2Ffoo%3Fbar%3Dbaz">'
'<script>location.href="https://example.com/redirected?returnTo=/foo?bar=baz";</script><meta http-equiv="refresh" content="0;url=https://example.com/redirected?returnTo=%2Ffoo%3Fbar%3Dbaz">'
);
});

test('escapes characters in redirect', () => {
const content = read('redirect-malicious.html');
assert.equal(
content,
'<meta http-equiv="refresh" content="0;url=https://example.com/</script>alert(&quot;pwned&quot;)">'
'<script>location.href="https://example.com/%3C/script%3Ealert(%22pwned%22)";</script><meta http-equiv="refresh" content="0;url=https://example.com/</script>alert(&quot;pwned&quot;)">'
);
});

test('renders a relative redirect', () => {
const content = read('redirect-relative.html');
assert.equal(
content,
'<script>location.href="/env";</script><meta http-equiv="refresh" content="0;url=/env">'
);
});

Expand Down