chore: do not make middleware a virtual module

withastro · May 24, 2023 · d69e831 · d69e831
1 parent eabc987
commit d69e831
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/packages/astro/src/core/build/plugins/plugin-middleware.ts b/packages/astro/src/core/build/plugins/plugin-middleware.ts
@@ -20,28 +20,33 @@ export function vitePluginMiddleware(
 			}
 		},
 
-		resolveId(id) {
+		async resolveId(id) {
 			if (id === MIDDLEWARE_MODULE_ID && opts.settings.config.experimental.middleware) {
-				return RESOLVED_MIDDLEWARE_MODULE_ID;
-			}
-		},
-
-		async load(id) {
-			if (id === RESOLVED_MIDDLEWARE_MODULE_ID && opts.settings.config.experimental.middleware) {
-				const imports: string[] = [];
-				const exports: string[] = [];
-				let middlewareId = await this.resolve(
+				const middlewareId = await this.resolve(
 					`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
 				);
 				if (middlewareId) {
-					imports.push(`import { onRequest } from "${middlewareId.id}"`);
-					exports.push(`export { onRequest }`);
+					return middlewareId.id;
 				}
-				const result = [imports.join('\n'), exports.join('\n')];
-
-				return result.join('\n');
 			}
 		},
+
+		// async load(id) {
+		// 	if (id === RESOLVED_MIDDLEWARE_MODULE_ID && opts.settings.config.experimental.middleware) {
+		// 		const imports: string[] = [];
+		// 		const exports: string[] = [];
+		// 		let middlewareId = await this.resolve(
+		// 			`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
+		// 		);
+		// 		if (middlewareId) {
+		// 			imports.push(`import { onRequest } from "${middlewareId.id}"`);
+		// 			exports.push(`export { onRequest }`);
+		// 		}
+		// 		const result = [imports.join('\n'), exports.join('\n')];
+		//
+		// 		return result.join('\n');
+		// 	}
+		// },
 	};
 }