Fix proxy renaming

Author: mischnic

packages/next/src/build/entries.ts

@@ -20,8 +20,6 @@ import {
   APP_DIR_ALIAS,
   WEBPACK_LAYERS,
   INSTRUMENTATION_HOOK_FILENAME,
-  PROXY_FILENAME,
-  MIDDLEWARE_FILENAME,
 } from '../lib/constants'
 import { isAPIRoute } from '../lib/is-api-route'
 import { isEdgeRuntime } from '../lib/is-edge-runtime'
@@ -574,7 +572,7 @@ export interface CreateEntrypointsParams {
   buildId: string
   config: NextConfigComplete
   envFiles: LoadedEnvFiles
-  isDev?: boolean
+  isDev: boolean
   pages: MappedPages
   pagesDir?: string
   previewMode: __ApiPreviewProps
@@ -643,6 +641,7 @@ export function getEdgeServerEntry(opts: {
     return {
       import: `next-middleware-loader?${stringify(loaderParams)}!`,
       layer: WEBPACK_LAYERS.middleware,
+      filename: 'middleware.js',
     }
   }
 
@@ -770,7 +769,7 @@ export function runDependingOnPageType<T>(params: {
     return
   }
 
-  if (isMiddlewareFile(params.page) && !isProxyFile(params.page)) {
+  if (isMiddlewareFile(params.page)) {
     if (params.pageRuntime === 'nodejs') {
       params.onServer()
       return
@@ -953,13 +952,7 @@ export async function createEntrypoints(
                 isDev: false,
               })
           } else if (isMiddlewareFile(page)) {
-            server[
-              serverBundlePath
-                // proxy.js still uses middleware.js for bundle path for now.
-                // TODO: Revisit when we remove middleware.js.
-                .replace(PROXY_FILENAME, MIDDLEWARE_FILENAME)
-                .replace('src/', '')
-            ] = getEdgeServerEntry({
+            server[serverBundlePath.replace('src/', '')] = getEdgeServerEntry({
               ...params,
               rootDir,
               absolutePagePath: absolutePagePath,
@@ -1034,12 +1027,7 @@ export async function createEntrypoints(
                   : undefined,
               }).import
             }
-            const edgeServerBundlePath = isMiddlewareFile(page)
-              ? serverBundlePath
-                  .replace(PROXY_FILENAME, MIDDLEWARE_FILENAME)
-                  .replace('src/', '')
-              : serverBundlePath
-            edgeServer[edgeServerBundlePath] = getEdgeServerEntry({
+            edgeServer[serverBundlePath] = getEdgeServerEntry({
               ...params,
               rootDir,
               absolutePagePath: absolutePagePath,

packages/next/src/build/get-static-info-including-layouts.ts

@@ -29,7 +29,7 @@ export async function getStaticInfoIncludingLayouts({
   pageFilePath: string
   appDir: string | undefined
   config: NextConfigComplete
-  isDev: boolean | undefined
+  isDev: boolean
   page: string
 }): Promise<PageStaticInfo> {
   // TODO: sync types for pages: PAGE_TYPES, ROUTER_TYPE, 'app' | 'pages', etc.

packages/next/src/server/next-server.ts

@@ -1578,30 +1578,13 @@ export default class NextNodeServer extends BaseServer<
           // of mapping proxy to middleware as the entry, just fallback
           // to proxy.
           // TODO: Remove this once we handle as the single entrypoint.
-          try {
-            return require(
-              join(
-                /* turbopackIgnore: true */ this.distDir,
-                'server',
-                'middleware.js'
-              )
+          return require(
+            join(
+              /* turbopackIgnore: true */ this.distDir,
+              'server',
+              'middleware.js'
             )
-          } catch (middlewareErr) {
-            if (
-              isError(middlewareErr) &&
-              (middlewareErr.code === 'ENOENT' ||
-                middlewareErr.code === 'MODULE_NOT_FOUND')
-            ) {
-              return require(
-                join(
-                  /* turbopackIgnore: true */ this.distDir,
-                  'server',
-                  'proxy.js'
-                )
-              )
-            }
-            throw middlewareErr
-          }
+          )
         }
       } catch (err) {
         if (