Skip to content

fix(navigation): reuse the redirected response instead of refetching #578

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
MaxtuneLee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(navigation): reuse the redirected response instead of refetching #578

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
22 changes: 6 additions & 16 deletions packages/void/src/pages/navigation-engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,23 +706,13 @@ export async function createPageNavigationEngine(
window.location.href = method === 'GET' ? url : response.url;
return undefined;
}
commitTarget.fetchUrl = redirectUrl.pathname + redirectUrl.search;
// The browser already followed the redirect: treat the final response as the GET
// result for the destination instead of fetching it a second time.
method = 'GET';
fetchUrl = redirectUrl.pathname + redirectUrl.search;
url = fetchUrl + redirectUrl.hash;
commitTarget.fetchUrl = fetchUrl;
commitTarget.hash = redirectUrl.hash;
return loadNavigationShell(
id,
redirectUrl.pathname + redirectUrl.search + redirectUrl.hash,
redirectUrl.pathname + redirectUrl.search,
'GET',
{
preserveScroll: options.preserveScroll,
preserveState: options.preserveState,
replace: options.replace,
viewTransition: options.viewTransition,
},
signal,
commitTarget,
deferredRegistry,
);
}

if (response && method !== 'GET' && !response.ok) {
Expand Down
9 changes: 3 additions & 6 deletions packages/void/test/unit/pages-client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,18 +1131,15 @@ describe('createVoidRouter other-origin visits', () => {

it('follows a same-host Capacitor action redirect in place', async () => {
const { router, fetchMock, applyUpdate } = await createRouter('capacitor://localhost');
const response = pageJson({});
const response = pageJson({ component: 'users', props: { users: [] } });
Object.defineProperties(response, {
redirected: { value: true },
url: { value: 'capacitor://localhost/users' },
});
fetchMock.mockResolvedValueOnce(response);
await router.visit('/submit', { method: 'POST' });
expect(fetchMock).toHaveBeenNthCalledWith(
2,
'/users',
expect.objectContaining({ method: 'GET' }),
);
// The redirect destination is rendered from the followed response, not fetched again.
expect(fetchMock).toHaveBeenCalledTimes(1);
expect(applyUpdate).toHaveBeenCalledTimes(1);
expect(window.location.href).toBeUndefined();
});
Expand Down