From d6d7076d63e448e509ec5f1ac035d8b079080311 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Fri, 23 Jun 2023 15:34:42 +0100
Subject: [PATCH] code suggestions

---
 .changeset/chilly-pants-fix.md           | 6 +++---
 packages/astro/src/@types/astro.ts       | 2 +-
 packages/astro/src/core/build/index.ts   | 6 +++---
 packages/astro/src/integrations/index.ts | 6 +++---
 packages/astro/test/middleware.test.js   | 1 -
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.changeset/chilly-pants-fix.md b/.changeset/chilly-pants-fix.md
index f7a99c46e9ce3..da4f6f89a2f2e 100644
--- a/.changeset/chilly-pants-fix.md
+++ b/.changeset/chilly-pants-fix.md
@@ -11,8 +11,8 @@ function integration(): AstroIntegration {
     return {
         name: "fancy-astro-integration",
         hooks: {
-            'astro:build:done': ({ middlewarePath }) => { 
-                if (middlewarePath) {
+            'astro:build:done': ({ middlewareEntryPoint }) => { 
+                if (middlewareEntryPoint) {
                     // do some operations
                 }
             }
@@ -21,4 +21,4 @@ function integration(): AstroIntegration {
 }
 ```
 
-The `middlewarePath` is only defined if the user has created an Astro middleware.
+The `middlewareEntryPoint` is only defined if the user has created an Astro middleware.
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 8bca9f6234ab1..9f4b23fef944d 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1869,7 +1869,7 @@ export interface AstroIntegration {
 			pages: { pathname: string }[];
 			dir: URL;
 			routes: RouteData[];
-			middlewarePath: URL | undefined;
+			middlewareEntryPoint: URL | undefined;
 		}) => void | Promise<void>;
 	};
 }
diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts
index 49d8fbef1a798..777b7b45537ad 100644
--- a/packages/astro/src/core/build/index.ts
+++ b/packages/astro/src/core/build/index.ts
@@ -188,7 +188,7 @@ class AstroBuilder {
 		});
 		debug('build', timerMessage('Additional assets copied', this.timer.assetsStart));
 
-		let newMiddlewareEntryPoint = undefined;
+		let middlewareEntryPoint = undefined;
 		// during the last phase of the build, the emitted code gets copied inside
 		// `dist/server/` folder, so we need to shred the old URL and make a new one again
 		if (internals.middlewareEntryPoint && isServerLikeOutput(this.settings.config)) {
@@ -196,7 +196,7 @@ class AstroBuilder {
 			const middlewareRelativePath = fileURLToPath(internals.middlewareEntryPoint).slice(
 				fileURLToPath(this.settings.config.outDir).length
 			);
-			newMiddlewareEntryPoint = pathToFileURL(join(outDir, 'server', middlewareRelativePath));
+			middlewareEntryPoint = pathToFileURL(join(outDir, 'server', middlewareRelativePath));
 		}
 
 		// You're done! Time to clean up.
@@ -205,7 +205,7 @@ class AstroBuilder {
 			pages: pageNames,
 			routes: Object.values(allPages).map((pd) => pd.route),
 			logging: this.logging,
-			middlewarePath: newMiddlewareEntryPoint,
+			middlewareEntryPoint,
 		});
 
 		if (this.logging.level && levels[this.logging.level] <= levels['info']) {
diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts
index b48cdfbdbcf67..c89dfca027692 100644
--- a/packages/astro/src/integrations/index.ts
+++ b/packages/astro/src/integrations/index.ts
@@ -348,7 +348,7 @@ type RunHookBuildDone = {
 	pages: string[];
 	routes: RouteData[];
 	logging: LogOptions;
-	middlewarePath: URL | undefined;
+	middlewareEntryPoint: URL | undefined;
 };
 
 export async function runHookBuildDone({
@@ -356,7 +356,7 @@ export async function runHookBuildDone({
 	pages,
 	routes,
 	logging,
-	middlewarePath,
+	middlewareEntryPoint,
 }: RunHookBuildDone) {
 	const dir = isServerLikeOutput(config) ? config.build.client : config.outDir;
 	await fs.promises.mkdir(dir, { recursive: true });
@@ -369,7 +369,7 @@ export async function runHookBuildDone({
 					pages: pages.map((p) => ({ pathname: p })),
 					dir,
 					routes,
-					middlewarePath,
+					middlewareEntryPoint,
 				}),
 				logging,
 			});
diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js
index c769e629ad79b..70c0702f3bf8f 100644
--- a/packages/astro/test/middleware.test.js
+++ b/packages/astro/test/middleware.test.js
@@ -215,7 +215,6 @@ describe('Middleware API in PROD mode, SSR', () => {
 		expect(middlewarePath).to.not.be.undefined;
 		try {
 			const path = fileURLToPath(middlewarePath);
-			console.log(path);
 			expect(existsSync(path)).to.be.true;
 			const content = readFileSync(fileURLToPath(middlewarePath), 'utf-8');
 			expect(content.length).to.be.greaterThan(0);