fix: bad import of pages

withastro · May 30, 2023 · 62a524d · 62a524d
1 parent 7f98f46
commit 62a524d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
@@ -137,8 +137,8 @@ export class App {
 			defaultStatus = 404;
 		}
 
-		let page = await this.#manifest.pageMap.get(routeData.component)!();
-		let mod = await page.page();
+		let mod = await this.#manifest.pageMap.get(routeData.component)!();
+		// let mod = await page.page();
 
 		if (routeData.type === 'page') {
 			let response = await this.#renderPage(request, routeData, mod, defaultStatus);
@@ -147,8 +147,8 @@ export class App {
 			if (response.status === 500 || response.status === 404) {
 				const errorPageData = matchRoute('/' + response.status, this.#manifestData);
 				if (errorPageData && errorPageData.route !== routeData.route) {
-					page = await this.#manifest.pageMap.get(errorPageData.component)!();
-					mod = await page.page();
+					mod = await this.#manifest.pageMap.get(errorPageData.component)!();
+					// mod = await page.page();
 					try {
 						let errorResponse = await this.#renderPage(
 							request,

diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
@@ -7,7 +7,7 @@ import type {
 	SSRLoadedRenderer,
 	SSRResult,
 } from '../../@types/astro';
-import type { SinglePageBuiltModule } from '../build/types';
+import type { ComponentInstance } from '../../@types/astro';
 
 export type ComponentPath = string;
 
@@ -31,7 +31,6 @@ export interface RouteInfo {
 export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
 	routeData: SerializedRouteData;
 };
-type ImportComponentInstance = () => Promise<SinglePageBuiltModule>;
 
 export interface SSRManifest {
 	adapterName: string;
@@ -40,7 +39,7 @@ export interface SSRManifest {
 	base?: string;
 	assetsPrefix?: string;
 	markdown: MarkdownRenderingOptions;
-	pageMap: Map<ComponentPath, ImportComponentInstance>;
+	pageMap: Map<ComponentPath, () => ComponentInstance>;
 	renderers: SSRLoadedRenderer[];
 	/**
 	 * Map of directive name (e.g. `load`) to the directive script code

diff --git a/packages/astro/src/core/build/plugins/plugin-middleware.ts b/packages/astro/src/core/build/plugins/plugin-middleware.ts
@@ -19,7 +19,7 @@ export function vitePluginMiddleware(
 					`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
 				);
 				if (middlewareId) {
-					return middlewareId.id;
+					return middlewareId;
 				}
 			}
 		},

diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts
@@ -50,7 +50,7 @@ function vitePluginSSR(
 				let middleware;
 				const middlewareModule = await this.resolve(MIDDLEWARE_MODULE_ID);
 				if (middlewareModule) {
-					imports.push(`import * as _middleware from "${middlewareModule.id}"`);
+					imports.push(`import * as _middleware from '${MIDDLEWARE_MODULE_ID}'`);
 					middleware = 'middleware: _middleware';
 				}
 				let i = 0;
@@ -60,12 +60,14 @@ function vitePluginSSR(
 					const virtualModuleName = getVirtualModulePageNameFromPath(path);
 					let module = await this.resolve(virtualModuleName);
 					if (module) {
-						const variable = `_page${i}`;
-						// we need to use the non-resolved ID in order to resolve correctly the virtual module
-						imports.push(`const ${variable}  = () => import("${virtualModuleName}");`);
-
 						const pageData = internals.pagesByComponent.get(path);
 						if (pageData) {
+							const variable = `_page${i}`;
+							// we need to use the non-resolved ID in order to resolve correctly the virtual module
+							imports.push(
+								`const ${variable}  = () => import(${JSON.stringify(pageData.moduleSpecifier)});`
+							);
+
 							pageMap.push(`[${JSON.stringify(pageData.component)}, ${variable}]`);
 						}
 						i++;

diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
@@ -179,9 +179,9 @@ async function ssrBuild(
 							return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId);
 						} else if (
 							// checks if the path of the module we have middleware, e.g. middleware.js / middleware/index.js
-							chunkInfo.facadeModuleId?.includes('middleware') &&
+							chunkInfo.moduleIds.find((m) => m.includes('middleware')) !== undefined &&
 							// checks if the file actually export the `onRequest` function
-							chunkInfo.exports.includes('onRequest')
+							chunkInfo.exports.includes('_middleware')
 						) {
 							return 'middleware.mjs';
 						} else if (chunkInfo.facadeModuleId === SSR_VIRTUAL_MODULE_ID) {