Merge branch 'main' into ep/implement-client-ip-through-context-obj

Author: ericapisani

demos/server-components/next.config.js

@@ -5,7 +5,7 @@ module.exports = {
     ignoreDuringBuilds: true,
   },
   experimental: {
-    runtime: 'edge',
+    runtime: 'experimental-edge',
     serverComponents: true,
   },
 }

demos/server-components/pages/csr.js

@@ -50,5 +50,5 @@ export default function News() {
 }
 
 export const config = {
-  runtime: 'edge',
+  runtime: 'experimental-edge',
 }

demos/server-components/pages/rsc.server.js

@@ -27,12 +27,11 @@ function NewsWithData() {
   return (
     <>
       {error ? <ErrorPlaceholder error={error} /> : null}
-      {storyIds ?
-        storyIds.slice(0, 30).map((id) => {
-          return <StoryWithData id={id} key={id} />
-        }) : 
-        null
-      }
+      {storyIds
+        ? storyIds.slice(0, 30).map((id) => {
+            return <StoryWithData id={id} key={id} />
+          })
+        : null}
     </>
   )
 }
@@ -50,5 +49,5 @@ export default function News() {
 }
 
 export const config = {
-  runtime: 'edge',
-}
+  runtime: 'experimental-edge',
+}

demos/server-components/pages/slow.server.js

@@ -15,9 +15,7 @@ import useData from '../lib/use-data'
 import Skeletons from '../components/skeletons'
 
 function StoryWithData({ id }) {
-  const { data } = useData(`s-${id}`, () =>
-    fetchData(`item/${id}`).then(transform)
-  )
+  const { data } = useData(`s-${id}`, () => fetchData(`item/${id}`).then(transform))
   return <Story {...data} />
 }
 
@@ -49,5 +47,5 @@ export default function News() {
 }
 
 export const config = {
-  runtime: 'edge',
+  runtime: 'experimental-edge',
 }