chore: rename again

Author: ascorbic

plugin/package.json

@@ -53,7 +53,7 @@
     "publish:pull": "git pull",
     "publish:install": "npm ci",
     "publish:test": "cd .. && npm ci && npm test",
-    "clean": "rimraf lib",
+    "clean": "rimraf lib dist-types",
     "build": "tsc",
     "watch": "tsc --watch",
     "prepare": "npm run build"

plugin/src/middleware/index.ts

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

plugin/src/middleware/middleware-request.ts renamed to plugin/src/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 { NextOriginResponse } from './next-origin-response'
+import { MiddlewareResponse } from './response'
 
 // TODO: add Context type
 type Context = {
@@ -44,10 +44,10 @@ export class MiddlewareRequest {
     })
   }
 
-  async next(): Promise<NextOriginResponse> {
+  async next(): Promise<MiddlewareResponse> {
     this.applyHeaders()
     const response = await this.context.next()
-    return new NextOriginResponse(response)
+    return new MiddlewareResponse(response)
   }
 
   rewrite(destination: string | URL | NextURL, init?: ResponseInit): NextResponse {

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

@@ -7,7 +7,7 @@ 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 NextOriginResponse extends NextResponse {
+export class MiddlewareResponse extends NextResponse {
   private readonly dataTransforms: NextDataTransform[]
   private readonly elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
   constructor(public originResponse: Response) {

plugin/src/templates/edge/utils.ts

@@ -37,7 +37,7 @@ export const addMiddlewareHeaders = async (
   return response
 }
 
-interface NextOriginResponse extends Response {
+interface MiddlewareResponse extends Response {
   originResponse: Response
   dataTransforms: NextDataTransform[]
   elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
@@ -47,15 +47,15 @@ interface MiddlewareRequest {
   request: Request
   context: Context
   originalRequest: Request
-  next(): Promise<NextOriginResponse>
+  next(): Promise<MiddlewareResponse>
   rewrite(destination: string | URL, init?: ResponseInit): Response
 }
 
 function isMiddlewareRequest(response: Response | MiddlewareRequest): response is MiddlewareRequest {
   return 'originalRequest' in response
 }
 
-function isNextOriginResponse(response: Response | NextOriginResponse): response is NextOriginResponse {
+function isMiddlewareResponse(response: Response | MiddlewareResponse): response is MiddlewareResponse {
   return 'dataTransforms' in response
 }
 
@@ -72,7 +72,7 @@ export const buildResponse = async ({
   if (isMiddlewareRequest(result.response)) {
     result.response = await result.response.next()
   }
-  if (isNextOriginResponse(result.response)) {
+  if (isMiddlewareResponse(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')) {