Merge branch 'main' into trek/zero-2530-remove-deprecation-warning-for-vercel-certs-renew

trek · web-flow · commit d5074dbe5f38 · 2024-10-08T12:01:12.000-05:00
diff --git a/.changeset/proud-sheep-worry.md b/.changeset/proud-sheep-worry.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/next/test/fixtures/00-app-dir-no-ppr/app/(newroot)/dashboard/another-edge/page.js b/packages/next/test/fixtures/00-app-dir-no-ppr/app/(newroot)/dashboard/another-edge/page.js
@@ -1,4 +1,4 @@
-export const runtime = 'experimental-edge'
+export const runtime = 'edge'
 
 export default function AnotherPage(props) {
   return (
diff --git a/packages/next/test/fixtures/00-app-dir-no-ppr/app/edge-route-handler/route.js b/packages/next/test/fixtures/00-app-dir-no-ppr/app/edge-route-handler/route.js
@@ -1,4 +1,4 @@
-export const runtime = 'experimental-edge';
+export const runtime = 'edge';
 
 export const GET = req => {
   // use query to trigger dynamic usage
diff --git a/packages/next/test/fixtures/00-app-dir-ppr/app/(newroot)/dashboard/another-edge/page.js b/packages/next/test/fixtures/00-app-dir-ppr/app/(newroot)/dashboard/another-edge/page.js
@@ -1,4 +1,4 @@
-export const runtime = 'experimental-edge'
+export const runtime = 'edge'
 
 export default function AnotherPage(props) {
   return (
diff --git a/packages/next/test/fixtures/00-app-dir-ppr/app/edge-route-handler/route.js b/packages/next/test/fixtures/00-app-dir-ppr/app/edge-route-handler/route.js
@@ -1,4 +1,4 @@
-export const runtime = 'experimental-edge';
+export const runtime = 'edge';
 
 export const GET = req => {
   // use query to trigger dynamic usage

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export const runtime = 'experimental-edge'`
	`1`	`+export const runtime = 'edge'`
`2`	`2`
`3`	`3`	`export default function AnotherPage(props) {`
`4`	`4`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export const runtime = 'experimental-edge';`
	`1`	`+export const runtime = 'edge';`
`2`	`2`
`3`	`3`	`export const GET = req => {`
`4`	`4`	`// use query to trigger dynamic usage`