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

Allow server-only load functions to return more than JSON #6318

Merged
merged 25 commits into from
Aug 29, 2022
Merged

Allow server-only load functions to return more than JSON #6318

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1985b56
serialize initial data with devalue
Rich-Harris Aug 26, 2022
24b1984
generate __data.js
Rich-Harris Aug 26, 2022
b5d6f77
merge master
Rich-Harris Aug 26, 2022
fe30204
wire things up
Rich-Harris Aug 26, 2022
fb0621f
fix
Rich-Harris Aug 26, 2022
35de03c
update devalue
Rich-Harris Aug 26, 2022
3e8ec03
cachebust
Rich-Harris Aug 26, 2022
e303900
get it working
Rich-Harris Aug 26, 2022
401c02d
huh
Rich-Harris Aug 26, 2022
31010dc
fixes
Rich-Harris Aug 26, 2022
978d0d4
lint
Rich-Harris Aug 26, 2022
8481a6a
fixes
Rich-Harris Aug 26, 2022
60c8d66
fix
Rich-Harris Aug 26, 2022
859f4cb
fix
Rich-Harris Aug 26, 2022
5a113b6
update docs
Rich-Harris Aug 26, 2022
74d595b
fix
Rich-Harris Aug 26, 2022
3e523b9
merge
Rich-Harris Aug 26, 2022
91115f6
changeset
Rich-Harris Aug 26, 2022
5b4afb5
fix
Rich-Harris Aug 27, 2022
ae423fd
comment
Rich-Harris Aug 28, 2022
3e3d05d
add comments
Rich-Harris Aug 28, 2022
b970d5c
use already-serialized data
Rich-Harris Aug 28, 2022
358d0ce
use DATA_SUFFIX constant
Rich-Harris Aug 28, 2022
b0bea01
error nodes are not serialized for hydration
Rich-Harris Aug 29, 2022
5eafe2c
fix
Rich-Harris Aug 29, 2022
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
  • Loading branch information
@Rich-Harris
Rich-Harris committed Aug 26, 2022
commit 859f4cbd0d3028f482e782f160b68ce44a6ddb8e
2 changes: 1 addition & 1 deletion packages/kit/src/runtime/server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export async function respond(request, options, state) {
}
}

if (route?.page) {
if (route?.page && !is_data_request) {
const normalized = normalize_path(url.pathname, options.trailing_slash);

if (normalized !== url.pathname && !state.prerendering?.fallback) {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -27,7 +27,7 @@ test('renders a server-side redirect', () => {

const code = read('redirect-server/__data.js');
const window = {};
new Function('window', `(${code})`)(window);
new Function('window', code)(window);

assert.equal(window.__sveltekit_data, {
type: 'redirect',
Expand Down