From ee270859f7ab086e17746fd7ec0332b378545e9c Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 14 Oct 2022 11:32:56 -0700
Subject: [PATCH] rename config

---
 packages/next/build/webpack-config.ts          |  6 +++---
 .../build/webpack/plugins/middleware-plugin.ts | 18 ++++++++----------
 packages/next/server/config-schema.ts          |  2 +-
 packages/next/server/config-shared.ts          |  2 +-
 .../app/next.config.js                         |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 61b12d4a99adb..9ada810582674 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -251,7 +251,7 @@ export function getDefineEnv({
     'process.env.__NEXT_I18N_DOMAINS': JSON.stringify(config.i18n?.domains),
     'process.env.__NEXT_ANALYTICS_ID': JSON.stringify(config.analyticsId),
     'process.env.__NEXT_ALLOW_MIDDLEWARE_RESPONSE_BODY': JSON.stringify(
-      config.experimental.dangerouslyAllowMiddlewareResponseBody
+      config.experimental.allowMiddlewareResponseBody
     ),
     'process.env.__NEXT_NO_MIDDLEWARE_URL_NORMALIZE': JSON.stringify(
       config.experimental.skipMiddlewareUrlNormalize
@@ -1895,8 +1895,8 @@ export default async function getBaseWebpackConfig(
           dev,
           sriEnabled: !dev && !!config.experimental.sri?.algorithm,
           hasFontLoaders: !!config.experimental.fontLoaders,
-          dangerouslyAllowMiddlewareResponseBody:
-            !!config.experimental.dangerouslyAllowMiddlewareResponseBody,
+          allowMiddlewareResponseBody:
+            !!config.experimental.allowMiddlewareResponseBody,
         }),
       isClient &&
         new BuildManifestPlugin({
diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
index 46b5ab4cbf07e..14688a0932a4a 100644
--- a/packages/next/build/webpack/plugins/middleware-plugin.ts
+++ b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -340,14 +340,14 @@ function getCodeAnalyzer(params: {
   dev: boolean
   compiler: webpack.Compiler
   compilation: webpack.Compilation
-  dangerouslyAllowMiddlewareResponseBody: boolean
+  allowMiddlewareResponseBody: boolean
 }) {
   return (parser: webpack.javascript.JavascriptParser) => {
     const {
       dev,
       compiler: { webpack: wp },
       compilation,
-      dangerouslyAllowMiddlewareResponseBody,
+      allowMiddlewareResponseBody,
     } = params
     const { hooks } = parser
 
@@ -563,7 +563,7 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`,
         .tap(NAME, handleWrapWasmInstantiateExpression)
     }
 
-    if (!dangerouslyAllowMiddlewareResponseBody) {
+    if (!allowMiddlewareResponseBody) {
       hooks.new.for('Response').tap(NAME, handleNewResponseExpression)
       hooks.new.for('NextResponse').tap(NAME, handleNewResponseExpression)
     }
@@ -806,24 +806,23 @@ export default class MiddlewarePlugin {
   private readonly dev: boolean
   private readonly sriEnabled: boolean
   private readonly hasFontLoaders: boolean
-  private readonly dangerouslyAllowMiddlewareResponseBody: boolean
+  private readonly allowMiddlewareResponseBody: boolean
 
   constructor({
     dev,
     sriEnabled,
     hasFontLoaders,
-    dangerouslyAllowMiddlewareResponseBody,
+    allowMiddlewareResponseBody,
   }: {
     dev: boolean
     sriEnabled: boolean
     hasFontLoaders: boolean
-    dangerouslyAllowMiddlewareResponseBody: boolean
+    allowMiddlewareResponseBody: boolean
   }) {
     this.dev = dev
     this.sriEnabled = sriEnabled
     this.hasFontLoaders = hasFontLoaders
-    this.dangerouslyAllowMiddlewareResponseBody =
-      dangerouslyAllowMiddlewareResponseBody
+    this.allowMiddlewareResponseBody = allowMiddlewareResponseBody
   }
 
   public apply(compiler: webpack.Compiler) {
@@ -836,8 +835,7 @@ export default class MiddlewarePlugin {
         dev: this.dev,
         compiler,
         compilation,
-        dangerouslyAllowMiddlewareResponseBody:
-          this.dangerouslyAllowMiddlewareResponseBody,
+        allowMiddlewareResponseBody: this.allowMiddlewareResponseBody,
       })
       hooks.parser.for('javascript/auto').tap(NAME, codeAnalyzer)
       hooks.parser.for('javascript/dynamic').tap(NAME, codeAnalyzer)
diff --git a/packages/next/server/config-schema.ts b/packages/next/server/config-schema.ts
index 1d1593113a650..0dbc896330575 100644
--- a/packages/next/server/config-schema.ts
+++ b/packages/next/server/config-schema.ts
@@ -268,7 +268,7 @@ const configSchema = {
         appDir: {
           type: 'boolean',
         },
-        dangerouslyAllowMiddlewareResponseBody: {
+        allowMiddlewareResponseBody: {
           type: 'boolean',
         },
         externalDir: {
diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index 61bef9f18ae9e..09e41c61db6e4 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -79,7 +79,7 @@ export interface NextJsWebpackConfig {
 }
 
 export interface ExperimentalConfig {
-  dangerouslyAllowMiddlewareResponseBody?: boolean
+  allowMiddlewareResponseBody?: boolean
   skipMiddlewareUrlNormalize?: boolean
   skipTrailingSlashRedirect?: boolean
   optimisticClientCache?: boolean
diff --git a/test/e2e/skip-trailing-slash-redirect/app/next.config.js b/test/e2e/skip-trailing-slash-redirect/app/next.config.js
index 25c7dc10ea973..83ae7164fa568 100644
--- a/test/e2e/skip-trailing-slash-redirect/app/next.config.js
+++ b/test/e2e/skip-trailing-slash-redirect/app/next.config.js
@@ -3,7 +3,7 @@ const nextConfig = {
   experimental: {
     skipTrailingSlashRedirect: true,
     skipMiddlewareUrlNormalize: true,
-    dangerouslyAllowMiddlewareResponseBody: true,
+    allowMiddlewareResponseBody: true,
   },
   async redirects() {
     return [