rename

vercel · Oct 30, 2023 · a13f14c · a13f14c
1 parent 7e9282d
commit a13f14c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts b/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts
@@ -28,7 +28,7 @@ export type EdgeSSRLoaderQuery = {
   middlewareConfig: string
   serverActions?: {
     bodySizeLimit?: SizeLimit
-    allowedForwardingHosts?: string[]
+    allowedForwardedHosts?: string[]
   }
 }
 

diff --git a/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/render.ts b/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/render.ts
@@ -57,7 +57,7 @@ export function getRender({
   serverActionsManifest?: any
   serverActions?: {
     bodySizeLimit?: SizeLimit
-    allowedForwardingHosts?: string[]
+    allowedForwardedHosts?: string[]
   }
   config: NextConfigComplete
   buildId: string

diff --git a/packages/next/src/server/app-render/action-handler.ts b/packages/next/src/server/app-render/action-handler.ts
@@ -234,7 +234,7 @@ export async function handleAction({
   requestStore: RequestStore
   serverActions?: {
     bodySizeLimit?: SizeLimit
-    allowedForwardingHosts?: string[]
+    allowedForwardedHosts?: string[]
   }
   ctx: AppRenderContext
 }): Promise<
@@ -284,7 +284,7 @@ export async function handleAction({
     // These can be their reverse proxies or other safe hosts.
     if (
       typeof host === 'string' &&
-      serverActions?.allowedForwardingHosts?.includes(host)
+      serverActions?.allowedForwardedHosts?.includes(host)
     ) {
       // Ignore it
     } else {

diff --git a/packages/next/src/server/app-render/types.ts b/packages/next/src/server/app-render/types.ts
@@ -134,9 +134,9 @@ export interface RenderOptsPartial {
   ) => Promise<NextConfigComplete>
   serverActions?: {
     bodySizeLimit?: SizeLimit
-    allowedForwardingHosts?: string[]
+    allowedForwardedHosts?: string[]
   }
-  allowedForwardingHosts?: string[]
+  allowedForwardedHosts?: string[]
   params?: ParsedUrlQuery
   isPrefetch?: boolean
   ppr: boolean

diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -246,7 +246,7 @@ type BaseRenderOpts = {
   clientReferenceManifest?: ClientReferenceManifest
   serverActions?: {
     bodySizeLimit?: SizeLimit
-    allowedForwardingHosts?: string[]
+    allowedForwardedHosts?: string[]
   }
   serverActionsManifest?: any
   nextFontManifest?: NextFontManifest

diff --git a/packages/next/src/server/config-schema.ts b/packages/next/src/server/config-schema.ts
@@ -254,10 +254,10 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
         serverActions: z
           .object({
             bodySizeLimit: zSizeLimit.optional(),
-            allowedForwardingHosts: z.array(z.string()).optional(),
+            allowedForwardedHosts: z.array(z.string()).optional(),
           })
           .optional(),
-        allowedForwardingHosts: z.array(z.string()).optional(),
+        allowedForwardedHosts: z.array(z.string()).optional(),
         // The original type was Record<string, any>
         extensionAlias: z.record(z.string(), z.any()).optional(),
         externalDir: z.boolean().optional(),

diff --git a/packages/next/src/server/config-shared.ts b/packages/next/src/server/config-shared.ts
@@ -317,7 +317,7 @@ export interface ExperimentalConfig {
      * @example
      * ["my-reverse-proxy.com"]
      */
-    allowedForwardingHosts?: string[]
+    allowedForwardedHosts?: string[]
   }
 
   /**

diff --git a/packages/next/src/server/render.tsx b/packages/next/src/server/render.tsx
@@ -275,9 +275,9 @@ export type RenderOptsPartial = {
   serverComponents?: boolean
   serverActions?: {
     bodySizeLimit?: SizeLimit
-    allowedForwardingHosts?: string[]
+    allowedForwardedHosts?: string[]
   }
-  allowedForwardingHosts?: string[]
+  allowedForwardedHosts?: string[]
   customServer?: boolean
   crossOrigin?: 'anonymous' | 'use-credentials' | '' | undefined
   images: ImageConfigComplete

diff --git a/test/e2e/app-dir/actions/next.config.js b/test/e2e/app-dir/actions/next.config.js
@@ -6,7 +6,7 @@ module.exports = {
   },
   experimental: {
     serverActions: {
-      allowedForwardingHosts: ['safe.com'],
+      allowedForwardedHosts: ['safe.com'],
     },
   },
 }