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

Temporarily disable prefetch in new router #41086

Merged
merged 6 commits into from Oct 2, 2022
Merged

Temporarily disable prefetch in new router #41086

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
bdf2b69
Temporarily disable prefetch in new router
timneutkens Oct 1, 2022
457a57e
Merge branch 'canary' into fix/navigate-stuck
balazsorban44 Oct 1, 2022
7ca41b9
Merge branch 'canary' of github.com:vercel/next.js into fix/navigate-…
timneutkens Oct 2, 2022
2bf01ab
Fix lint
timneutkens Oct 2, 2022
4237137
Merge branch 'fix/navigate-stuck' of github.com:timneutkens/next.js i…
timneutkens Oct 2, 2022
1551a83
Temporarily disable test
timneutkens Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 28 additions & 30 deletions packages/next/client/components/app-router.client.tsx
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ import type {
import type { FlightRouterState, FlightData } from '../../server/app-render'
import {
ACTION_NAVIGATE,
ACTION_PREFETCH,
// ACTION_PREFETCH,
ACTION_RELOAD,
ACTION_RESTORE,
ACTION_SERVER_PATCH,
Expand Down Expand Up @@ -97,7 +97,7 @@ function ErrorOverlay({ children }: PropsWithChildren<{}>): ReactElement {
let initialParallelRoutes: CacheNode['parallelRoutes'] =
typeof window === 'undefined' ? null! : new Map()

const prefetched = new Set<string>()
// const prefetched = new Set<string>()

/**
* The global router that wraps the application components.
Expand Down Expand Up @@ -208,34 +208,32 @@ export default function AppRouter({

const routerInstance: AppRouterInstance = {
// TODO-APP: implement prefetching of flight
prefetch: async (href) => {
prefetch: async (_href) => {
// If prefetch has already been triggered, don't trigger it again.
if (prefetched.has(href)) {
return
}

prefetched.add(href)
const url = new URL(href, location.origin)

try {
// TODO-APP: handle case where history.state is not the new router history entry
const serverResponse = await fetchServerResponse(
url,
// initialTree is used when history.state.tree is missing because the history state is set in `useEffect` below, it being missing means this is the hydration case.
window.history.state?.tree || initialTree,
true
)
// @ts-ignore startTransition exists
React.startTransition(() => {
dispatch({
type: ACTION_PREFETCH,
url,
serverResponse,
})
})
} catch (err) {
console.error('PREFETCH ERROR', err)
}
// if (prefetched.has(href)) {
// return
// }
// prefetched.add(href)
// const url = new URL(href, location.origin)
// try {
// // TODO-APP: handle case where history.state is not the new router history entry
// const serverResponse = await fetchServerResponse(
// url,
// // initialTree is used when history.state.tree is missing because the history state is set in `useEffect` below, it being missing means this is the hydration case.
// window.history.state?.tree || initialTree,
// true
// )
// // @ts-ignore startTransition exists
// React.startTransition(() => {
// dispatch({
// type: ACTION_PREFETCH,
// url,
// serverResponse,
// })
// })
// } catch (err) {
// console.error('PREFETCH ERROR', err)
// }
},
replace: (href, options = {}) => {
// @ts-ignore startTransition exists
Expand Down Expand Up @@ -268,7 +266,7 @@ export default function AppRouter({
}

return routerInstance
}, [dispatch, initialTree])
}, [dispatch /*, initialTree*/])

useEffect(() => {
// When mpaNavigation flag is set do a hard navigation to the new url.
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/app-dir/index.test.ts
View file
Open in desktop
Expand Up @@ -418,7 +418,8 @@ describe('app dir', () => {
}
})

it('should soft push', async () => {
// TODO-APP: Re-enable this test.
it.skip('should soft push', async () => {
const browser = await webdriver(next.url, '/link-soft-push')

try {
Expand Down