test: adjustments for next@canary

tests/fixtures/middleware-conditions/pages/test/next.js

@@ -0,0 +1,16 @@
+export default function Page({ message }) {
+  return (
+    <main>
+      <h1>Message from middleware: {message}</h1>
+    </main>
+  )
+}
+
+/** @type {import('next').GetServerSideProps} */
+export const getServerSideProps = async (ctx) => {
+  return {
+    props: {
+      message: ctx.req.headers['x-hello-from-middleware-req'] || null,
+    },
+  }
+}

tests/integration/cache-handler.test.ts

@@ -19,6 +19,7 @@ import {
 } from '../utils/helpers.js'
 import {
   nextVersionSatisfies,
+  shouldHaveAppRouterGlobalErrorInPrerenderManifest,
   shouldHaveAppRouterNotFoundInPrerenderManifest,
 } from '../utils/next-version-helpers.mjs'
 
@@ -218,6 +219,7 @@ describe('app router', () => {
     expect(blobEntries.map(({ key }) => decodeBlobKey(key)).sort()).toEqual(
       [
         '/404',
+        shouldHaveAppRouterGlobalErrorInPrerenderManifest() ? '/_global-error' : undefined,
         shouldHaveAppRouterNotFoundInPrerenderManifest() ? '/_not-found' : undefined,
         '/index',
         '/posts/1',
@@ -371,6 +373,7 @@ describe('plugin', () => {
     expect(blobEntries.map(({ key }) => decodeBlobKey(key)).sort()).toEqual(
       [
         '/404',
+        shouldHaveAppRouterGlobalErrorInPrerenderManifest() ? '/_global-error' : undefined,
         shouldHaveAppRouterNotFoundInPrerenderManifest() ? '/_not-found' : undefined,
         '/api/revalidate-handler',
         '/api/static/first',

tests/integration/simple-app.test.ts

@@ -36,6 +36,7 @@ import {
 } from '../utils/helpers.js'
 import {
   nextVersionSatisfies,
+  shouldHaveAppRouterGlobalErrorInPrerenderManifest,
   shouldHaveAppRouterNotFoundInPrerenderManifest,
 } from '../utils/next-version-helpers.mjs'
 
@@ -394,6 +395,7 @@ test.skipIf(process.env.NEXT_VERSION !== 'canary')<FixtureTestContext>(
     expect(blobEntries.map(({ key }) => decodeBlobKey(key)).sort()).toEqual(
       [
         '/404',
+        shouldHaveAppRouterGlobalErrorInPrerenderManifest() ? '/_global-error' : undefined,
         shouldHaveAppRouterNotFoundInPrerenderManifest() ? '/_not-found' : undefined,
         '/index',
         '404.html',

tests/utils/next-version-helpers.mjs

@@ -38,6 +38,13 @@ export function shouldHaveAppRouterNotFoundInPrerenderManifest() {
   return nextVersionSatisfies(isNextCanary() ? '>=15.4.2-canary.33' : '>=15.5.0')
 }
 
+export function shouldHaveAppRouterGlobalErrorInPrerenderManifest() {
+  // https://github.com/vercel/next.js/pull/82444
+
+  // this is not used in any stable version yet
+  return isNextCanary() && nextVersionSatisfies('>=15.5.1-canary.4')
+}
+
 /**
  * Check if current next version requires React 19
  * @param {string} version Next version