support next proxy files

Author: chargome

packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts

@@ -15,6 +15,7 @@ type NextApiModule =
       // ESM export
       default?: EdgeRouteHandler;
       middleware?: EdgeRouteHandler;
+      proxy?: EdgeRouteHandler;
     }
   // CJS export
   | EdgeRouteHandler;
@@ -29,6 +30,9 @@ let userProvidedDefaultHandler: EdgeRouteHandler | undefined = undefined;
 if ('middleware' in userApiModule && typeof userApiModule.middleware === 'function') {
   // Handle when user defines via named ESM export: `export { middleware };`
   userProvidedNamedHandler = userApiModule.middleware;
+} else if ('proxy' in userApiModule && typeof userApiModule.proxy === 'function') {
+  // Handle when user defines via named ESM export (Next.js 16): `export { proxy };`
+  userProvidedNamedHandler = userApiModule.proxy;
 } else if ('default' in userApiModule && typeof userApiModule.default === 'function') {
   // Handle when user defines via ESM export: `export default myFunction;`
   userProvidedDefaultHandler = userApiModule.default;
@@ -40,6 +44,7 @@ if ('middleware' in userApiModule && typeof userApiModule.middleware === 'functi
 export const middleware = userProvidedNamedHandler
   ? Sentry.wrapMiddlewareWithSentry(userProvidedNamedHandler)
   : undefined;
+export const proxy = userProvidedNamedHandler ? Sentry.wrapMiddlewareWithSentry(userProvidedNamedHandler) : undefined;
 export default userProvidedDefaultHandler ? Sentry.wrapMiddlewareWithSentry(userProvidedDefaultHandler) : undefined;
 
 // Re-export anything exported by the page module we're wrapping. When processing this code, Rollup is smart enough to

packages/nextjs/src/config/webpack.ts

@@ -183,8 +183,11 @@ export function constructWebpackConfigFunction({
       );
     };
 
-    const possibleMiddlewareLocations = pageExtensions.map(middlewareFileEnding => {
-      return path.join(middlewareLocationFolder, `middleware.${middlewareFileEnding}`);
+    const possibleMiddlewareLocations = pageExtensions.flatMap(middlewareFileEnding => {
+      return [
+        path.join(middlewareLocationFolder, `middleware.${middlewareFileEnding}`),
+        path.join(middlewareLocationFolder, `proxy.${middlewareFileEnding}`),
+      ];
     });
     const isMiddlewareResource = (resourcePath: string): boolean => {
       const normalizedAbsoluteResourcePath = normalizeLoaderResourcePath(resourcePath);

packages/nextjs/test/config/loaders.test.ts

@@ -129,6 +129,27 @@ describe('webpack loaders', () => {
         resourcePath: '/Users/Maisey/projects/squirrelChasingSimulator/middleware.tsx',
         expectedWrappingTargetKind: undefined,
       },
+      // Next.js 16+ renamed middleware to proxy
+      {
+        resourcePath: '/Users/Maisey/projects/squirrelChasingSimulator/src/proxy.js',
+        expectedWrappingTargetKind: 'middleware',
+      },
+      {
+        resourcePath: '/Users/Maisey/projects/squirrelChasingSimulator/src/proxy.ts',
+        expectedWrappingTargetKind: 'middleware',
+      },
+      {
+        resourcePath: './src/proxy.ts',
+        expectedWrappingTargetKind: 'middleware',
+      },
+      {
+        resourcePath: '/Users/Maisey/projects/squirrelChasingSimulator/src/proxy.tsx',
+        expectedWrappingTargetKind: 'middleware',
+      },
+      {
+        resourcePath: '/Users/Maisey/projects/squirrelChasingSimulator/proxy.tsx',
+        expectedWrappingTargetKind: undefined,
+      },
       {
         resourcePath: '/Users/Maisey/projects/squirrelChasingSimulator/src/pages/api/testApiRoute.ts',
         expectedWrappingTargetKind: 'api-route',