From 07a6d4a8804baeb0e1f0562b13950d1b393aac90 Mon Sep 17 00:00:00 2001
From: Lee Robinson <me@leerob.io>
Date: Fri, 24 Jun 2022 10:43:36 -0500
Subject: [PATCH] Remove Middleware warning message. (#37973)

* Remove Middleware warning message.

* lint-fix

Co-authored-by: JJ Kasper <jj@jjsweb.site>
---
 packages/next/build/index.ts                  |  7 -------
 packages/next/server/next-server.ts           | 17 ++--------------
 .../e2e/middleware-general/test/index.test.ts | 20 +------------------
 3 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index 9a76c4d6fe206..fd18f9d85ed77 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -94,7 +94,6 @@ import {
   copyTracedFiles,
   isReservedPage,
   isServerComponentPage,
-  isMiddlewareFile,
 } from './utils'
 import getBaseWebpackConfig from './webpack-config'
 import { PagesManifest } from './webpack/plugins/pages-manifest-plugin'
@@ -431,12 +430,6 @@ export default async function build(
       const hasCustomErrorPage =
         mappedPages['/_error'].startsWith(PAGES_DIR_ALIAS)
 
-      if (Object.keys(mappedRootPaths || {}).some(isMiddlewareFile)) {
-        Log.warn(
-          `using beta Middleware (not covered by semver) - https://nextjs.org/docs/messages/beta-middleware`
-        )
-      }
-
       if (hasPublicDir) {
         const hasPublicUnderScoreNextDir = await fileExists(
           path.join(publicDir, '_next')
diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
index 7031e4285b8ef..d9a2fb00d3ce2 100644
--- a/packages/next/server/next-server.ts
+++ b/packages/next/server/next-server.ts
@@ -2,12 +2,7 @@ import './node-polyfill-fetch'
 import './node-polyfill-web-streams'
 
 import type { Route } from './router'
-import {
-  CacheFs,
-  DecodeError,
-  execOnce,
-  PageNotFoundError,
-} from '../shared/lib/utils'
+import { CacheFs, DecodeError, PageNotFoundError } from '../shared/lib/utils'
 import type { MiddlewareManifest } from '../build/webpack/plugins/middleware-plugin'
 import type RenderResult from './render-result'
 import type { FetchEventResult } from './web/types'
@@ -109,12 +104,6 @@ export interface NodeRequestHandler {
   ): Promise<void>
 }
 
-const middlewareBetaWarning = execOnce(() => {
-  Log.warn(
-    `using beta Middleware (not covered by semver) - https://nextjs.org/docs/messages/beta-middleware`
-  )
-})
-
 export default class NextNodeServer extends BaseServer {
   private imageResponseCache?: ResponseCache
 
@@ -1162,9 +1151,7 @@ export default class NextNodeServer extends BaseServer {
     parsed: UrlWithParsedQuery
     onWarning?: (warning: Error) => void
   }) {
-    middlewareBetaWarning()
-
-    // middleware is skipped for on-demand revalidate requests
+    // Middleware is skipped for on-demand revalidate requests
     if (
       checkIsManualRevalidate(params.request, this.renderOpts.previewProps)
         .isManualRevalidate
diff --git a/test/e2e/middleware-general/test/index.test.ts b/test/e2e/middleware-general/test/index.test.ts
index c23063b300491..7e2d46cedba3f 100644
--- a/test/e2e/middleware-general/test/index.test.ts
+++ b/test/e2e/middleware-general/test/index.test.ts
@@ -4,11 +4,9 @@ import fs from 'fs-extra'
 import { join } from 'path'
 import webdriver from 'next-webdriver'
 import { NextInstance } from 'test/lib/next-modes/base'
-import { check, fetchViaHTTP, renderViaHTTP, waitFor } from 'next-test-utils'
+import { check, fetchViaHTTP, waitFor } from 'next-test-utils'
 import { createNext, FileRef } from 'e2e-utils'
-import escapeStringRegexp from 'escape-string-regexp'
 
-const middlewareWarning = 'using beta Middleware (not covered by semver)'
 const urlsError = 'Please use only absolute URLs'
 
 describe('Middleware Runtime', () => {
@@ -76,14 +74,6 @@ describe('Middleware Runtime', () => {
 
   function runTests({ i18n }: { i18n?: boolean }) {
     if ((global as any).isNextDev) {
-      it('should have showed warning for middleware usage', async () => {
-        await renderViaHTTP(next.url, '/')
-        await check(
-          () => next.cliOutput,
-          new RegExp(escapeStringRegexp(middlewareWarning))
-        )
-      })
-
       it('refreshes the page when middleware changes ', async () => {
         const browser = await webdriver(next.url, `/about`)
         await browser.eval('window.didrefresh = "hello"')
@@ -128,14 +118,6 @@ describe('Middleware Runtime', () => {
         })
       })
 
-      it('should have middleware warning during build', () => {
-        expect(next.cliOutput).toContain(middlewareWarning)
-      })
-
-      it('should have middleware warning during start', () => {
-        expect(next.cliOutput).toContain(middlewareWarning)
-      })
-
       it('should have correct files in manifest', async () => {
         const manifest = await fs.readJSON(
           join(next.testDir, '.next/server/middleware-manifest.json')