vercel · kodiakhq · Jun 14, 2023 · Jun 14, 2023 · Jun 14, 2023 · Jun 14, 2023
@@ -157,9 +157,16 @@ export function navigateReducer(
     temporaryCacheNode.subTreeData = state.cache.subTreeData
     temporaryCacheNode.parallelRoutes = new Map(state.cache.parallelRoutes)
 
-    const data = createRecordFromThenable(
-      fetchServerResponse(url, optimisticTree, state.nextUrl, state.buildId)
-    )
+    let data: ReturnType<typeof createRecordFromThenable> | undefined
+
+    const fetchResponse = () => {
+      if (!data) {
+        data = createRecordFromThenable(
+          fetchServerResponse(url, optimisticTree, state.nextUrl, state.buildId)
+        )
+      }
+      return data
+    }
 
     // TODO-APP: segments.slice(1) strips '', we can get rid of '' altogether.
     // TODO-APP: re-evaluate if we need to strip the last segment
@@ -174,7 +181,7 @@ export function navigateReducer(
       temporaryCacheNode,
       state.cache,
       optimisticFlightSegmentPath,
-      () => data,
+      fetchResponse,
       true
     )
 

@@ -0,0 +1,51 @@
+import { createNextDescribe } from 'e2e-utils'
+
+const getPathname = (url: string) => {
+  const urlObj = new URL(url)
+  return urlObj.pathname
+}
+
+const createRequestsListener = async (browser: BrowserInterface) => {
+  // wait for network idle
+  await browser.waitForIdleNetwork()
+
+  let requests = []
+
+  browser.on('request', (req: Request) => {
+    requests.push([req.url(), !!req.headers()['next-router-prefetch']])
+  })
+
+  await browser.refresh()
+
+  return {
+    getRequests: () => requests,
+    clearRequests: () => {
+      requests = []
+    },
+  }
+}
+
+createNextDescribe(
+  'app-prefetch-false',
+  {
+    files: __dirname,
+  },
+  ({ next, isNextDev }) => {
+    if (isNextDev) {
+      it.skip('should skip test in dev mode', () => {})
+    } else {
+      it('should avoid double-fetching when optimistic navigation fails', async () => {
+        const browser = await next.browser('/foo')
+        const { getRequests } = await createRequestsListener(browser)
+
+        await browser.elementByCss('[href="/foo"]').click()
+        await browser.elementByCss('[href="/foo/bar"]').click()
+        console.log('getRequests()', getRequests())
+        expect(
+          getRequests().filter(([req]) => getPathname(req) === '/foo/bar')
+            .length
+        ).toBe(1)
+      })
+    }
+  }
+)
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>hello world</p>
+}
@@ -0,0 +1,3 @@
+export default function Layout({ children }) {
+  return children
+}
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>hello world</p>
+}
@@ -0,0 +1,22 @@
+import Link from 'next/link'
+import React from 'react'
+
+export default function Root({ children }: { children: React.ReactNode }) {
+  return (
+    <html>
+      <body>
+        <div>
+          <Link prefetch={false} href="/foo">
+            foo
+          </Link>
+        </div>
+        <div>
+          <Link prefetch={false} href="/foo/bar">
+            foo/bar
+          </Link>
+        </div>
+        {children}
+      </body>
+    </html>
+  )
+}
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>hello world</p>
+}
@@ -0,0 +1,6 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {}
+
+module.exports = nextConfig