chore: rename again

Author: ascorbic

demos/middleware/middleware.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 
-import { EnhancedMiddleware } from '@netlify/plugin-nextjs/middleware'
+import { MiddlewareRequest } from '@netlify/plugin-nextjs/middleware'
 
 export async function middleware(request: NextRequest) {
   let response
@@ -11,7 +11,7 @@ export async function middleware(request: NextRequest) {
 
   if (pathname.startsWith('/static')) {
     // Unlike NextResponse.next(), this actually sends the request to the origin
-    const res = await new EnhancedMiddleware(request).next()
+    const res = await new MiddlewareRequest(request).next()
     const message = `This was static but has been transformed in ${request.geo.city}`
 
     // Transform the response page data
@@ -38,13 +38,13 @@ export async function middleware(request: NextRequest) {
   if (pathname.startsWith('/api/hello')) {
     // Add a header to the request
     request.headers.set('x-hello', 'world')
-    return new EnhancedMiddleware(request).next()
+    return new MiddlewareRequest(request).next()
   }
 
   if (pathname.startsWith('/headers')) {
     // Add a header to the rewritten request
     request.headers.set('x-hello', 'world')
-    return new EnhancedMiddleware(request).rewrite('/api/hello')
+    return new MiddlewareRequest(request).rewrite('/api/hello')
   }
 
   if (pathname.startsWith('/cookies')) {

plugin/src/middleware/index.ts

@@ -1,3 +1,3 @@
-export * from './enhanced-next-response'
-export * from './enhanced-middleware'
+export * from './next-origin-response'
+export * from './middleware-request'
 export * from './html-rewriter'

plugin/src/middleware/enhanced-middleware.ts renamed to plugin/src/middleware/middleware-request.ts

@@ -3,7 +3,7 @@ import { NextURL } from 'next/dist/server/web/next-url'
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
 
-import { EnhancedNextResponse } from './enhanced-next-response'
+import { NextOriginResponse } from './next-origin-response'
 
 // TODO: add Context type
 type Context = {
@@ -21,7 +21,7 @@ type AugmentedGeo = NextRequest['geo'] & {
 /**
  * Supercharge your Next middleware with Netlify Edge Functions
  */
-export class EnhancedMiddleware {
+export class MiddlewareRequest {
   context: Context
   originalRequest: Request
 
@@ -44,10 +44,10 @@ export class EnhancedMiddleware {
     })
   }
 
-  async next(): Promise<EnhancedNextResponse> {
+  async next(): Promise<NextOriginResponse> {
     this.applyHeaders()
     const response = await this.context.next()
-    return new EnhancedNextResponse(response)
+    return new NextOriginResponse(response)
   }
 
   rewrite(destination: string | URL | NextURL, init?: ResponseInit): NextResponse {
@@ -57,5 +57,12 @@ export class EnhancedMiddleware {
     this.applyHeaders()
     return NextResponse.rewrite(destination, init)
   }
+
+  redirect(destination: string | URL | NextURL, init?: number | ResponseInit) {
+    if (typeof destination === 'string' && destination.startsWith('/')) {
+      destination = new URL(destination, this.request.url)
+    }
+    return NextResponse.redirect(destination, init)
+  }
 }
 /* eslint-enable no-underscore-dangle */

plugin/src/middleware/enhanced-next-response.ts renamed to plugin/src/middleware/next-origin-response.ts

@@ -7,12 +7,11 @@ export type NextDataTransform = <T extends Record<string, any>>(props: T) => T
 
 // A NextReponse that wraps the Netlify origin response
 // We can't pass it through directly, because Next disallows returning a response body
-export class EnhancedNextResponse extends NextResponse {
+export class NextOriginResponse extends NextResponse {
   private readonly dataTransforms: NextDataTransform[]
   private readonly elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
   constructor(public originResponse: Response) {
     super()
-    this.originResponse = originResponse
 
     // These are private in Node when compiling, but we access them in Deno at runtime
     Object.defineProperty(this, 'dataTransforms', {

plugin/src/templates/edge/utils.ts

@@ -37,25 +37,25 @@ export const addMiddlewareHeaders = async (
   return response
 }
 
-interface EnhancedNextResponse extends Response {
+interface NextOriginResponse extends Response {
   originResponse: Response
   dataTransforms: NextDataTransform[]
   elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
 }
 
-interface EnhancedMiddleware {
+interface MiddlewareRequest {
   request: Request
   context: Context
   originalRequest: Request
-  next(): Promise<EnhancedNextResponse>
+  next(): Promise<NextOriginResponse>
   rewrite(destination: string | URL, init?: ResponseInit): Response
 }
 
-function isEnhancedMiddleware(response: Response | EnhancedMiddleware): response is EnhancedMiddleware {
+function isMiddlewareRequest(response: Response | MiddlewareRequest): response is MiddlewareRequest {
   return 'originalRequest' in response
 }
 
-function isEnhancedNextResponse(response: Response | EnhancedNextResponse): response is EnhancedNextResponse {
+function isNextOriginResponse(response: Response | NextOriginResponse): response is NextOriginResponse {
   return 'dataTransforms' in response
 }
 
@@ -68,11 +68,11 @@ export const buildResponse = async ({
   request: Request
   context: Context
 }) => {
-  // They've returned the EnhancedMiddleware directly, so we'll call `next()` for them.
-  if (isEnhancedMiddleware(result.response)) {
+  // They've returned the MiddlewareRequest directly, so we'll call `next()` for them.
+  if (isMiddlewareRequest(result.response)) {
     result.response = await result.response.next()
   }
-  if (isEnhancedNextResponse(result.response)) {
+  if (isNextOriginResponse(result.response)) {
     const { response } = result
     // If it's JSON we don't need to use the rewriter, we can just parse it
     if (response.originResponse.headers.get('content-type')?.includes('application/json')) {