Merge branch 'canary' into tests/match-path-behavior

vercel · Jan 28, 2023 · c953640 · c953640
2 parents 6726d1e + b0cf241
commit c953640
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 129 deletions.
diff --git a/.github/workflows/test_react_experimental.yml b/.github/workflows/test_react_experimental.yml
diff --git a/.github/workflows/test_react_next.yml b/.github/workflows/test_react_next.yml
diff --git a/packages/next/src/client/components/router-reducer/router-reducer-types.ts b/packages/next/src/client/components/router-reducer/router-reducer-types.ts
@@ -8,6 +8,14 @@ export const ACTION_RESTORE = 'restore'
 export const ACTION_SERVER_PATCH = 'server-patch'
 export const ACTION_PREFETCH = 'prefetch'
 
+export interface Mutable {
+  mpaNavigation?: boolean
+  previousTree?: FlightRouterState
+  patchedTree?: FlightRouterState
+  canonicalUrlOverride?: string
+  useExistingCache?: true
+}
+
 /**
  * Refresh triggers a refresh of the full page data.
  * - fetches the Flight data and fills subTreeData at the root of the cache.
@@ -16,12 +24,7 @@ export const ACTION_PREFETCH = 'prefetch'
 export interface RefreshAction {
   type: typeof ACTION_REFRESH
   cache: CacheNode
-  mutable: {
-    previousTree?: FlightRouterState
-    patchedTree?: FlightRouterState
-    mpaNavigation?: boolean
-    canonicalUrlOverride?: string
-  }
+  mutable: Mutable
 }
 
 /**
@@ -65,13 +68,7 @@ export interface NavigateAction {
   navigateType: 'push' | 'replace'
   forceOptimisticNavigation: boolean
   cache: CacheNode
-  mutable: {
-    mpaNavigation?: boolean
-    previousTree?: FlightRouterState
-    patchedTree?: FlightRouterState
-    canonicalUrlOverride?: string
-    useExistingCache?: true
-  }
+  mutable: Mutable
 }
 
 /**
@@ -98,11 +95,7 @@ export interface ServerPatchAction {
   previousTree: FlightRouterState
   overrideCanonicalUrl: URL | undefined
   cache: CacheNode
-  mutable: {
-    patchedTree?: FlightRouterState
-    mpaNavigation?: boolean
-    canonicalUrlOverride?: string
-  }
+  mutable: Mutable
 }
 
 /**

diff --git a/test/integration/api-support/test/index.test.js b/test/integration/api-support/test/index.test.js
@@ -308,16 +308,24 @@ function runTests(dev = false) {
 
   it('should show friendly error for invalid redirect', async () => {
     await fetchViaHTTP(appPort, '/api/redirect-error', null, {})
-    expect(stderr).toContain(
-      `Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination').`
-    )
+
+    await check(() => {
+      expect(stderr).toContain(
+        `Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination').`
+      )
+      return 'yes'
+    }, 'yes')
   })
 
   it('should show friendly error in case of passing null as first argument redirect', async () => {
     await fetchViaHTTP(appPort, '/api/redirect-null', null, {})
-    expect(stderr).toContain(
-      `Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination').`
-    )
+
+    check(() => {
+      expect(stderr).toContain(
+        `Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination').`
+      )
+      return 'yes'
+    }, 'yes')
   })
 
   it('should redirect with status code 307', async () => {
@@ -547,10 +555,14 @@ function runTests(dev = false) {
     it('should show false positive warning if not using externalResolver flag', async () => {
       const apiURL = '/api/external-resolver-false-positive'
       const req = await fetchViaHTTP(appPort, apiURL)
-      expect(stderr).toContain(
-        `API resolved without sending a response for ${apiURL}, this may result in stalled requests.`
-      )
       expect(await req.text()).toBe('hello world')
+
+      check(() => {
+        expect(stderr).toContain(
+          `API resolved without sending a response for ${apiURL}, this may result in stalled requests.`
+        )
+        return 'yes'
+      }, 'yes')
     })
 
     it('should not show warning if using externalResolver flag', async () => {