fix(next-server): Fix priority for edge routes

packages/next/server/next-server.ts

@@ -1049,20 +1049,16 @@ export default class NextNodeServer extends BaseServer {
     return manifest
   }
 
-  /**
-   * Return a list of middleware routing items. This method exists to be later
-   * overridden by the development server in order to use a different source
-   * to get the list.
-   */
+  /** Returns a middleware routing item. */
   protected getMiddleware(): RoutingItem | undefined {
     const manifest = this.getMiddlewareManifest()
-    const rootMiddleware = manifest?.middleware?.['/']
-    if (!rootMiddleware) {
+    const middleware = manifest?.middleware?.['/']
+    if (!middleware) {
       return
     }
 
     return {
-      match: getMiddlewareMatcher(rootMiddleware),
+      match: getMiddlewareMatcher(middleware),
       page: '/',
     }
   }
@@ -1079,13 +1075,6 @@ export default class NextNodeServer extends BaseServer {
     }))
   }
 
-  protected getEdgeRoutes(): RoutingItem[] {
-    const edgeFunctions = this.getEdgeFunctions()
-    const middleware = this.getMiddleware()
-
-    return edgeFunctions.concat(middleware ? [middleware] : [])
-  }
-
   /**
    * Get information for the edge function located in the provided page
    * folder. If the edge function info can't be found it will throw

packages/next/server/router.ts

@@ -242,7 +242,6 @@ export default class Router {
         // disabled
         ...(this.useFileSystemPublicRoutes
           ? [
-              ...(edgeSSRCatchAllRoute ? [edgeSSRCatchAllRoute] : []),
               {
                 type: 'route',
                 name: 'page checker',

test/e2e/edge-vs.-non-edge-api-route-priority/index.test.ts

@@ -0,0 +1,33 @@
+import { createNext } from 'e2e-utils'
+import { NextInstance } from 'test/lib/next-modes/base'
+import { fetchViaHTTP } from 'next-test-utils'
+
+describe('Edge vs. non-Edge API route priority', () => {
+  let next: NextInstance
+
+  beforeAll(async () => {
+    next = await createNext({
+      files: {
+        'pages/api/user/login.js': `
+            export default async function handler(_, res) {
+              res.send('from login.js')
+            }
+        `,
+        'pages/api/user/[id].js': `
+          export const config = {
+            runtime: 'experimental-edge',
+          }
+          export default async function handler() {
+            return new Response('from [id].js')
+          }`,
+      },
+      dependencies: {},
+    })
+  })
+  afterAll(() => next.destroy())
+
+  it('more specific route should match', async () => {
+    const res = await fetchViaHTTP(next.url, '/api/user/login')
+    expect(await res.text()).toBe('from login.js')
+  })
+})

test/lib/next-test-utils.js

@@ -114,6 +114,7 @@ export function renderViaHTTP(appPort, pathname, query, opts) {
   return fetchViaHTTP(appPort, pathname, query, opts).then((res) => res.text())
 }
 
+/** @return {Response} */
 export function fetchViaHTTP(appPort, pathname, query, opts) {
   const url = `${pathname}${
     typeof query === 'string' ? query : query ? `?${qs.stringify(query)}` : ''