Merge branch 'canary' into remove-react-modes-config

Author: devknoll

test/integration/router-is-ready/pages/auto-export/[slug].js

@@ -1,13 +1,17 @@
 import { useRouter } from 'next/router'
+import { useLayoutEffect } from 'react'
 
 export default function Page(props) {
   const router = useRouter()
 
   if (typeof window !== 'undefined') {
-    if (!window.isReadyValues) {
-      window.isReadyValues = []
-    }
-    window.isReadyValues.push(router.isReady)
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useLayoutEffect(() => {
+      if (!window.isReadyValues) {
+        window.isReadyValues = []
+      }
+      window.isReadyValues.push(router.isReady)
+    }, [router])
   }
 
   return (

test/integration/router-is-ready/pages/auto-export/index.js

@@ -1,13 +1,17 @@
 import { useRouter } from 'next/router'
+import { useLayoutEffect } from 'react'
 
 export default function Page(props) {
   const router = useRouter()
 
   if (typeof window !== 'undefined') {
-    if (!window.isReadyValues) {
-      window.isReadyValues = []
-    }
-    window.isReadyValues.push(router.isReady)
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useLayoutEffect(() => {
+      if (!window.isReadyValues) {
+        window.isReadyValues = []
+      }
+      window.isReadyValues.push(router.isReady)
+    }, [router])
   }
 
   return (

test/integration/router-is-ready/pages/gip.js

@@ -1,13 +1,17 @@
 import { useRouter } from 'next/router'
+import { useLayoutEffect } from 'react'
 
 export default function Page(props) {
   const router = useRouter()
 
   if (typeof window !== 'undefined') {
-    if (!window.isReadyValues) {
-      window.isReadyValues = []
-    }
-    window.isReadyValues.push(router.isReady)
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useLayoutEffect(() => {
+      if (!window.isReadyValues) {
+        window.isReadyValues = []
+      }
+      window.isReadyValues.push(router.isReady)
+    }, [router])
   }
 
   return (

test/integration/router-is-ready/pages/gsp.js

@@ -1,13 +1,17 @@
 import { useRouter } from 'next/router'
+import { useLayoutEffect } from 'react'
 
 export default function Page(props) {
   const router = useRouter()
 
   if (typeof window !== 'undefined') {
-    if (!window.isReadyValues) {
-      window.isReadyValues = []
-    }
-    window.isReadyValues.push(router.isReady)
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useLayoutEffect(() => {
+      if (!window.isReadyValues) {
+        window.isReadyValues = []
+      }
+      window.isReadyValues.push(router.isReady)
+    }, [router])
   }
 
   return (

test/integration/router-is-ready/pages/gssp.js

@@ -1,13 +1,17 @@
 import { useRouter } from 'next/router'
+import { useLayoutEffect } from 'react'
 
 export default function Page(props) {
   const router = useRouter()
 
   if (typeof window !== 'undefined') {
-    if (!window.isReadyValues) {
-      window.isReadyValues = []
-    }
-    window.isReadyValues.push(router.isReady)
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useLayoutEffect(() => {
+      if (!window.isReadyValues) {
+        window.isReadyValues = []
+      }
+      window.isReadyValues.push(router.isReady)
+    }, [router])
   }
 
   return (