{now}
+ + ) +} + +export const getStaticProps = () => ({ + props: { + now: Date.now(), + }, +}) diff --git a/test/e2e/middleware-rewrites/test/index.test.ts b/test/e2e/middleware-rewrites/test/index.test.ts index 59b2393868fb..8fca4eb1f888 100644 --- a/test/e2e/middleware-rewrites/test/index.test.ts +++ b/test/e2e/middleware-rewrites/test/index.test.ts @@ -276,21 +276,14 @@ describe('Middleware Rewrite', () => { }) if (!(global as any).isNextDev) { - it('should cache data requests correctly', async () => { + it('should not prefetch non-SSG routes', async () => { const browser = await webdriver(next.url, '/') await check(async () => { const hrefs = await browser.eval( `Object.keys(window.next.router.sdc)` ) - for (const url of [ - '/en/about.json?override=external', - '/en/about.json?override=internal', - '/en/rewrite-me-external-twice.json', - '/en/rewrite-me-to-about.json?override=internal', - '/en/rewrite-me-to-vercel.json', - '/en/rewrite-to-ab-test.json', - ]) { + for (const url of ['/en/ssg.json']) { if (!hrefs.some((href) => href.includes(url))) { return JSON.stringify(hrefs, null, 2) } diff --git a/test/integration/dynamic-routing/test/index.test.js b/test/integration/dynamic-routing/test/index.test.js index 75f8beddd0b3..7c72bd0b069d 100644 --- a/test/integration/dynamic-routing/test/index.test.js +++ b/test/integration/dynamic-routing/test/index.test.js @@ -46,37 +46,17 @@ function runTests({ dev, serverless }) { } const cacheKeys = await getCacheKeys() - expect(cacheKeys).toEqual( - process.env.__MIDDLEWARE_TEST - ? [ - '/_next/data/BUILD_ID/[name].json?another=value&name=%5Bname%5D', - '/_next/data/BUILD_ID/added-later/first.json?name=added-later&comment=first', - '/_next/data/BUILD_ID/blog/321/comment/123.json?name=321&id=123', - '/_next/data/BUILD_ID/d/dynamic-1.json?id=dynamic-1', - '/_next/data/BUILD_ID/index.json', - '/_next/data/BUILD_ID/on-mount/test-w-hash.json?post=test-w-hash', - '/_next/data/BUILD_ID/p1/p2/all-ssg/hello.json?rest=hello', - '/_next/data/BUILD_ID/p1/p2/all-ssg/hello1/hello2.json?rest=hello1&rest=hello2', - '/_next/data/BUILD_ID/p1/p2/all-ssr/:42.json?rest=%3A42', - '/_next/data/BUILD_ID/p1/p2/all-ssr/hello.json?rest=hello', - '/_next/data/BUILD_ID/p1/p2/all-ssr/hello1%2F/he%2Fllo2.json?rest=hello1%2F&rest=he%2Fllo2', - '/_next/data/BUILD_ID/p1/p2/all-ssr/hello1/hello2.json?rest=hello1&rest=hello2', - '/_next/data/BUILD_ID/p1/p2/nested-all-ssg/hello.json?rest=hello', - '/_next/data/BUILD_ID/p1/p2/nested-all-ssg/hello1/hello2.json?rest=hello1&rest=hello2', - '/_next/data/BUILD_ID/post-1.json?fromHome=true&name=post-1', - '/_next/data/BUILD_ID/post-1.json?hidden=value&name=post-1', - '/_next/data/BUILD_ID/post-1.json?name=post-1', - '/_next/data/BUILD_ID/post-1.json?name=post-1&another=value', - '/_next/data/BUILD_ID/post-1/comment-1.json?name=post-1&comment=comment-1', - '/_next/data/BUILD_ID/post-1/comments.json?name=post-1', - ] - : [ - '/_next/data/BUILD_ID/p1/p2/all-ssg/hello.json?rest=hello', - '/_next/data/BUILD_ID/p1/p2/all-ssg/hello1/hello2.json?rest=hello1&rest=hello2', - '/_next/data/BUILD_ID/p1/p2/nested-all-ssg/hello.json?rest=hello', - '/_next/data/BUILD_ID/p1/p2/nested-all-ssg/hello1/hello2.json?rest=hello1&rest=hello2', - ] - ) + expect(cacheKeys).toEqual([ + ...(process.env.__MIDDLEWARE_TEST + ? // data route is fetched with middleware due to query hydration + // since middleware matches the index route + ['/_next/data/BUILD_ID/index.json'] + : []), + '/_next/data/BUILD_ID/p1/p2/all-ssg/hello.json?rest=hello', + '/_next/data/BUILD_ID/p1/p2/all-ssg/hello1/hello2.json?rest=hello1&rest=hello2', + '/_next/data/BUILD_ID/p1/p2/nested-all-ssg/hello.json?rest=hello', + '/_next/data/BUILD_ID/p1/p2/nested-all-ssg/hello1/hello2.json?rest=hello1&rest=hello2', + ]) // ensure no new cache entries after navigation const links = [ diff --git a/test/integration/middleware-prefetch/tests/index.test.js b/test/integration/middleware-prefetch/tests/index.test.js index 67c3ae2b3f83..c5ee0526f9b8 100644 --- a/test/integration/middleware-prefetch/tests/index.test.js +++ b/test/integration/middleware-prefetch/tests/index.test.js @@ -71,16 +71,12 @@ describe('Middleware Production Prefetch', () => { const mapped = hrefs.map((href) => new URL(href).pathname.replace(/^\/_next\/data\/[^/]+/, '') ) - assert.deepEqual(mapped, [ - '/index.json', - '/made-up.json', - '/ssg-page-2.json', - ]) + assert.deepEqual(mapped, ['/index.json']) return 'yes' }, 'yes') }) - it(`doesn't prefetch when the destination will be rewritten`, async () => { + it(`prefetches provided path even if it will be rewritten`, async () => { const browser = await webdriver(context.appPort, `/`) await browser.elementByCss('#ssg-page-2').moveTo() await check(async () => { @@ -88,7 +84,7 @@ describe('Middleware Production Prefetch', () => { const attrs = await Promise.all( scripts.map((script) => script.getAttribute('src')) ) - return attrs.find((src) => src.includes('/ssg-page-2')) ? 'nope' : 'yes' + return attrs.find((src) => src.includes('/ssg-page-2')) ? 'yes' : 'nope' }, 'yes') }) })