astro 2.5.5 → 2.5.6

package/dist/core/app/index.js

@@ -19,8 +19,6 @@ import {
 import { matchRoute } from "../routing/match.js";
 import { deserializeManifest } from "./common.js";
 const clientLocalsSymbol = Symbol.for("astro.locals");
-const pagesVirtualModuleId = "@astrojs-pages-virtual-entry";
-const resolvedPagesVirtualModuleId = "\0" + pagesVirtualModuleId;
 const responseSentSymbol = Symbol.for("astro.responseSent");
 class App {
   #env;
@@ -115,13 +113,15 @@ class App {
     if (routeData.route === "/404") {
       defaultStatus = 404;
     }
-    let mod = await this.#manifest.pageMap.get(routeData.component)();
+    let page = 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);
       if (response.status === 500 || response.status === 404) {
         const errorPageData = matchRoute("/" + response.status, this.#manifestData);
         if (errorPageData && errorPageData.route !== routeData.route) {
-          mod = await this.#manifest.pageMap.get(errorPageData.component)();
+          page = await this.#manifest.pageMap.get(errorPageData.component)();
+          mod = await page.page();
           try {
             let errorResponse = await this.#renderPage(
               request,
@@ -265,7 +265,5 @@ class App {
 }
 export {
   App,
-  deserializeManifest,
-  pagesVirtualModuleId,
-  resolvedPagesVirtualModuleId
+  deserializeManifest
 };

package/dist/core/app/types.d.ts

@@ -1,5 +1,6 @@
 import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
-import type { AstroMiddlewareInstance, ComponentInstance, RouteData, SerializedRouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
+import type { AstroMiddlewareInstance, RouteData, SerializedRouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../@types/astro';
+import type { SinglePageBuiltModule } from '../build/types';
 export type ComponentPath = string;
 export type StylesheetAsset = {
     type: 'inline';
@@ -24,7 +25,7 @@ export interface RouteInfo {
 export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
     routeData: SerializedRouteData;
 };
-type ImportComponentInstance = () => Promise<ComponentInstance>;
+type ImportComponentInstance = () => Promise<SinglePageBuiltModule>;
 export interface SSRManifest {
     adapterName: string;
     routes: RouteInfo[];

package/dist/core/build/generate.js

@@ -6,7 +6,10 @@ import {
   generateImage as generateImageInternal,
   getStaticImageList
 } from "../../assets/generate.js";
-import { hasPrerenderedPages } from "../../core/build/internal.js";
+import {
+  eachPageDataFromEntryPoint,
+  hasPrerenderedPages
+} from "../../core/build/internal.js";
 import {
   prependForwardSlash,
   removeLeadingForwardSlash,
@@ -30,7 +33,7 @@ import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
 import { getOutputFilename } from "../util.js";
 import { getOutDirWithinCwd, getOutFile, getOutFolder } from "./common.js";
-import { cssOrder, eachPageData, getPageDataByComponent, mergeInlineCss } from "./internal.js";
+import { cssOrder, getPageDataByComponent, mergeInlineCss } from "./internal.js";
 import { getTimeStat } from "./util.js";
 function shouldSkipDraft(pageModule, settings) {
   var _a;
@@ -66,17 +69,20 @@ async function generatePages(opts, internals) {
   const verb = ssr ? "prerendering" : "generating";
   info(opts.logging, null, `
 ${bgGreen(black(` ${verb} static routes `))}`);
-  const ssrEntryURL = new URL("./" + serverEntry + `?time=${Date.now()}`, outFolder);
-  const ssrEntry = await import(ssrEntryURL.toString());
   const builtPaths = /* @__PURE__ */ new Set();
   if (ssr) {
-    for (const pageData of eachPageData(internals)) {
-      if (pageData.route.prerender)
-        await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
+    for (const [pageData, filePath] of eachPageDataFromEntryPoint(internals)) {
+      if (pageData.route.prerender) {
+        const ssrEntryURLPage = new URL("./" + filePath + `?time=${Date.now()}`, outFolder);
+        const ssrEntryPage = await import(ssrEntryURLPage.toString());
+        await generatePage(opts, internals, pageData, ssrEntryPage, builtPaths);
+      }
     }
   } else {
-    for (const pageData of eachPageData(internals)) {
-      await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
+    for (const [pageData, filePath] of eachPageDataFromEntryPoint(internals)) {
+      const ssrEntryURLPage = new URL("./" + filePath + `?time=${Date.now()}`, outFolder);
+      const ssrEntryPage = await import(ssrEntryURLPage.toString());
+      await generatePage(opts, internals, pageData, ssrEntryPage, builtPaths);
     }
   }
   if (opts.settings.config.experimental.assets) {
@@ -108,14 +114,13 @@ async function generateImage(opts, transform, path) {
   info(opts.logging, null, `  ${green("\u25B6")} ${path} ${dim(statsText)} ${dim(timeIncrease)}`);
 }
 async function generatePage(opts, internals, pageData, ssrEntry, builtPaths) {
-  var _a;
   let timeStart = performance.now();
   const renderers = ssrEntry.renderers;
   const pageInfo = getPageDataByComponent(internals, pageData.route.component);
   const linkIds = [];
   const scripts = (pageInfo == null ? void 0 : pageInfo.hoistedScript) ?? null;
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
-  const pageModulePromise = (_a = ssrEntry.pageMap) == null ? void 0 : _a.get(pageData.component);
+  const pageModulePromise = ssrEntry.page;
   const middleware = ssrEntry.middleware;
   if (!pageModulePromise) {
     throw new Error(

package/dist/core/build/graph.js

@@ -1,4 +1,4 @@
-import { resolvedPagesVirtualModuleId } from "../app/index.js";
+import { ASTRO_PAGE_RESOLVED_MODULE_ID } from "./plugins/plugin-pages.js";
 function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PURE__ */ new Set(), childId = "") {
   seen.add(id);
   const info = ctx.getModuleInfo(id);
@@ -25,7 +25,8 @@ function* walkParentInfos(id, ctx, until, depth = 0, order = 0, seen = /* @__PUR
   }
 }
 function moduleIsTopLevelPage(info) {
-  return info.importers[0] === resolvedPagesVirtualModuleId || info.dynamicImporters[0] == resolvedPagesVirtualModuleId;
+  var _a, _b;
+  return ((_a = info.importers[0]) == null ? void 0 : _a.includes(ASTRO_PAGE_RESOLVED_MODULE_ID)) || ((_b = info.dynamicImporters[0]) == null ? void 0 : _b.includes(ASTRO_PAGE_RESOLVED_MODULE_ID));
 }
 function* getTopLevelPages(id, ctx) {
   for (const res of walkParentInfos(id, ctx)) {

package/dist/core/build/internal.d.ts

@@ -1,13 +1,16 @@
 import type { Rollup } from 'vite';
-import type { PageBuildData, StylesheetAsset, ViteID } from './types';
 import type { SSRResult } from '../../@types/astro';
 import type { PageOptions } from '../../vite-plugin-astro/types';
+import type { PageBuildData, StylesheetAsset, ViteID } from './types';
 export interface BuildInternals {
     /**
-     * The module ids of all CSS chunks, used to deduplicate CSS assets between
-     * SSR build and client build in vite-plugin-css.
+     * Each CSS module is named with a chunk id derived from the Astro pages they
+     * are used in by default. It's easy to crawl this relation in the SSR build as
+     * the Astro pages are the entrypoint, but not for the client build as hydratable
+     * components are the entrypoint instead. This map is used as a cache from the SSR
+     * build so the client can pick up the same information and use the same chunk ids.
      */
-    cssChunkModuleIds: Set<string>;
+    cssModuleToChunkIdMap: Map<string, string>;
     hoistedScriptIdToHoistedMap: Map<string, Set<string>>;
     hoistedScriptIdToPagesMap: Map<string, Set<string>>;
     entrySpecifierToBundleMap: Map<string, string>;
@@ -76,6 +79,7 @@ export declare function getPageDataByComponent(internals: BuildInternals, compon
 export declare function getPageDataByViteID(internals: BuildInternals, viteid: ViteID): PageBuildData | undefined;
 export declare function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID): boolean;
 export declare function eachPageData(internals: BuildInternals): Generator<PageBuildData, void, undefined>;
+export declare function eachPageDataFromEntryPoint(internals: BuildInternals): Generator<[PageBuildData, string]>;
 export declare function hasPrerenderedPages(internals: BuildInternals): boolean;
 interface OrderInfo {
     depth: number;

package/dist/core/build/internal.js

@@ -1,10 +1,11 @@
 import { prependForwardSlash, removeFileExtension } from "../path.js";
 import { viteID } from "../util.js";
+import { ASTRO_PAGE_EXTENSION_POST_PATTERN, ASTRO_PAGE_MODULE_ID } from "./plugins/plugin-pages.js";
 function createBuildInternals() {
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToPagesMap = /* @__PURE__ */ new Map();
   return {
-    cssChunkModuleIds: /* @__PURE__ */ new Set(),
+    cssModuleToChunkIdMap: /* @__PURE__ */ new Map(),
     hoistedScriptIdToHoistedMap,
     hoistedScriptIdToPagesMap,
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
@@ -82,6 +83,22 @@ function hasPageDataByViteID(internals, viteid) {
 function* eachPageData(internals) {
   yield* internals.pagesByComponent.values();
 }
+function* eachPageDataFromEntryPoint(internals) {
+  for (const [entryPoint, filePath] of internals.entrySpecifierToBundleMap) {
+    if (entryPoint.includes(ASTRO_PAGE_MODULE_ID)) {
+      const [, pageName] = entryPoint.split(":");
+      const pageData = internals.pagesByComponent.get(
+        `${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".")}`
+      );
+      if (!pageData) {
+        throw new Error(
+          "Build failed. Astro couldn't find the emitted page from " + pageName + " pattern"
+        );
+      }
+      yield [pageData, filePath];
+    }
+  }
+}
 function hasPrerenderedPages(internals) {
   for (const pageData of eachPageData(internals)) {
     if (pageData.route.prerender) {
@@ -140,6 +157,7 @@ export {
   createBuildInternals,
   cssOrder,
   eachPageData,
+  eachPageDataFromEntryPoint,
   getPageDataByComponent,
   getPageDataByViteID,
   getPageDatasByChunk,

package/dist/core/build/plugins/plugin-css.js

@@ -37,28 +37,28 @@ function rollupPluginAstroBuildCSS(options) {
   const pagesToPropagatedCss = {};
   const cssBuildPlugin = {
     name: "astro:rollup-plugin-build-css",
-    transform(_, id) {
-      if (options.target === "client" && internals.cssChunkModuleIds.has(id)) {
-        return "";
-      }
-    },
     outputOptions(outputOptions) {
-      if (options.target === "client")
-        return;
       const assetFileNames = outputOptions.assetFileNames;
       const namingIncludesHash = assetFileNames == null ? void 0 : assetFileNames.toString().includes("[hash]");
       const createNameForParentPages = namingIncludesHash ? assetName.shortHashedName : assetName.createSlugger(settings);
       extendManualChunks(outputOptions, {
         after(id, meta) {
           if (isBuildableCSSRequest(id)) {
+            if (options.target === "client") {
+              return internals.cssModuleToChunkIdMap.get(id);
+            }
             for (const [pageInfo] of walkParentInfos(id, {
               getModuleInfo: meta.getModuleInfo
             })) {
               if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
-                return createNameHash(id, [id]);
+                const chunkId2 = createNameHash(id, [id]);
+                internals.cssModuleToChunkIdMap.set(id, chunkId2);
+                return chunkId2;
               }
             }
-            return createNameForParentPages(id, meta);
+            const chunkId = createNameForParentPages(id, meta);
+            internals.cssModuleToChunkIdMap.set(id, chunkId);
+            return chunkId;
           }
         }
       });
@@ -72,11 +72,6 @@ function rollupPluginAstroBuildCSS(options) {
         const meta = chunk.viteMetadata;
         if (meta.importedCss.size < 1)
           continue;
-        if (options.target === "server") {
-          for (const id of Object.keys(chunk.modules)) {
-            internals.cssChunkModuleIds.add(id);
-          }
-        }
         if (options.target === "client") {
           for (const id of Object.keys(chunk.modules)) {
             for (const pageData of getParentClientOnlys(id, this, internals)) {

package/dist/core/build/plugins/plugin-middleware.d.ts

@@ -3,6 +3,5 @@ import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
 import type { StaticBuildOptions } from '../types';
 export declare const MIDDLEWARE_MODULE_ID = "@astro-middleware";
-export declare const RESOLVED_MIDDLEWARE_MODULE_ID = "\0@astro-middleware";
 export declare function vitePluginMiddleware(opts: StaticBuildOptions, _internals: BuildInternals): VitePlugin;
 export declare function pluginMiddleware(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-middleware.js

@@ -1,8 +1,6 @@
 import { MIDDLEWARE_PATH_SEGMENT_NAME } from "../../constants.js";
 import { addRollupInput } from "../add-rollup-input.js";
 const MIDDLEWARE_MODULE_ID = "@astro-middleware";
-const RESOLVED_MIDDLEWARE_MODULE_ID = "\0@astro-middleware";
-let inputs = /* @__PURE__ */ new Set();
 function vitePluginMiddleware(opts, _internals) {
   return {
     name: "@astro/plugin-middleware",
@@ -11,24 +9,14 @@ function vitePluginMiddleware(opts, _internals) {
         return addRollupInput(options, [MIDDLEWARE_MODULE_ID]);
       }
     },
-    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 = [];
-        const exports = [];
-        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");
       }
     }
   };
@@ -47,7 +35,6 @@ function pluginMiddleware(opts, internals) {
 }
 export {
   MIDDLEWARE_MODULE_ID,
-  RESOLVED_MIDDLEWARE_MODULE_ID,
   pluginMiddleware,
   vitePluginMiddleware
 };

package/dist/core/build/plugins/plugin-pages.d.ts

@@ -1,4 +1,14 @@
 import { type BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
 import type { StaticBuildOptions } from '../types';
+export declare const ASTRO_PAGE_MODULE_ID = "@astro-page:";
+export declare const ASTRO_PAGE_RESOLVED_MODULE_ID = "\0@astro-page:";
+export declare const ASTRO_PAGE_EXTENSION_POST_PATTERN = "@_@";
+/**
+ * 1. We add a fixed prefix, which is used as virtual module naming convention;
+ * 2. We replace the dot that belongs extension with an arbitrary string.
+ *
+ * @param path
+ */
+export declare function getVirtualModulePageNameFromPath(path: string): string;
 export declare function pluginPages(opts: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-pages.js

@@ -1,44 +1,56 @@
-import { pagesVirtualModuleId, resolvedPagesVirtualModuleId } from "../../app/index.js";
+import { extname } from "node:path";
 import { addRollupInput } from "../add-rollup-input.js";
-import { eachPageData } from "../internal.js";
 import { MIDDLEWARE_MODULE_ID } from "./plugin-middleware.js";
 import { RENDERERS_MODULE_ID } from "./plugin-renderers.js";
+const ASTRO_PAGE_MODULE_ID = "@astro-page:";
+const ASTRO_PAGE_RESOLVED_MODULE_ID = "\0@astro-page:";
+const ASTRO_PAGE_EXTENSION_POST_PATTERN = "@_@";
+function getVirtualModulePageNameFromPath(path) {
+  const extension = extname(path);
+  return `${ASTRO_PAGE_MODULE_ID}${path.replace(
+    extension,
+    extension.replace(".", ASTRO_PAGE_EXTENSION_POST_PATTERN)
+  )}`;
+}
 function vitePluginPages(opts, internals) {
   return {
     name: "@astro/plugin-build-pages",
     options(options) {
       if (opts.settings.config.output === "static") {
-        return addRollupInput(options, [pagesVirtualModuleId]);
+        const inputs = /* @__PURE__ */ new Set();
+        for (const path of Object.keys(opts.allPages)) {
+          inputs.add(getVirtualModulePageNameFromPath(path));
+        }
+        return addRollupInput(options, Array.from(inputs));
       }
     },
     resolveId(id) {
-      if (id === pagesVirtualModuleId) {
-        return resolvedPagesVirtualModuleId;
+      if (id.startsWith(ASTRO_PAGE_MODULE_ID)) {
+        return "\0" + id;
       }
     },
     async load(id) {
-      if (id === resolvedPagesVirtualModuleId) {
-        let importMap = "";
+      if (id.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {
         const imports = [];
         const exports = [];
-        const content = [];
-        let i = 0;
-        imports.push(`import { renderers } from "${RENDERERS_MODULE_ID}";`);
-        exports.push(`export { renderers };`);
-        for (const pageData of eachPageData(internals)) {
-          const variable = `_page${i}`;
-          imports.push(
-            `const ${variable} = () => import(${JSON.stringify(pageData.moduleSpecifier)});`
-          );
-          importMap += `[${JSON.stringify(pageData.component)}, ${variable}],`;
-          i++;
-        }
-        if (opts.settings.config.experimental.middleware) {
-          imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}";`);
-          exports.push(`export const middleware = _middleware;`);
+        const pageName = id.slice(ASTRO_PAGE_RESOLVED_MODULE_ID.length);
+        const pageData = internals.pagesByComponent.get(
+          `${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".")}`
+        );
+        if (pageData) {
+          const resolvedPage = await this.resolve(pageData.moduleSpecifier);
+          if (resolvedPage) {
+            imports.push(`const page = () => import(${JSON.stringify(pageData.moduleSpecifier)});`);
+            exports.push(`export { page }`);
+            imports.push(`import { renderers } from "${RENDERERS_MODULE_ID}";`);
+            exports.push(`export { renderers };`);
+            if (opts.settings.config.experimental.middleware) {
+              imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}";`);
+              exports.push(`export const middleware = _middleware;`);
+            }
+            return `${imports.join("\n")}${exports.join("\n")}`;
+          }
         }
-        content.push(`export const pageMap = new Map([${importMap}]);`);
-        return `${imports.join("\n")}${content.join("\n")}${exports.join("\n")}`;
       }
     }
   };
@@ -56,5 +68,9 @@ function pluginPages(opts, internals) {
   };
 }
 export {
+  ASTRO_PAGE_EXTENSION_POST_PATTERN,
+  ASTRO_PAGE_MODULE_ID,
+  ASTRO_PAGE_RESOLVED_MODULE_ID,
+  getVirtualModulePageNameFromPath,
   pluginPages
 };

package/dist/core/build/plugins/plugin-ssr.d.ts

@@ -1,6 +1,6 @@
-import type { StaticBuildOptions } from '../types';
 import { type BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
-export declare const virtualModuleId = "@astrojs-ssr-virtual-entry";
+import type { StaticBuildOptions } from '../types';
+export declare const SSR_VIRTUAL_MODULE_ID = "@astrojs-ssr-virtual-entry";
 export declare function injectManifest(buildOpts: StaticBuildOptions, internals: BuildInternals): Promise<string>;
 export declare function pluginSSR(options: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-ssr.js

@@ -3,49 +3,74 @@ import { fileURLToPath } from "url";
 import { runHookBuildSsr } from "../../../integrations/index.js";
 import { isHybridOutput } from "../../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
-import { pagesVirtualModuleId } from "../../app/index.js";
 import { joinPaths, prependForwardSlash } from "../../path.js";
 import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
 import { cssOrder, mergeInlineCss } from "../internal.js";
+import { MIDDLEWARE_MODULE_ID } from "./plugin-middleware.js";
+import { getVirtualModulePageNameFromPath } from "./plugin-pages.js";
 import { RENDERERS_MODULE_ID } from "./plugin-renderers.js";
-const virtualModuleId = "@astrojs-ssr-virtual-entry";
-const resolvedVirtualModuleId = "\0" + virtualModuleId;
+const SSR_VIRTUAL_MODULE_ID = "@astrojs-ssr-virtual-entry";
+const RESOLVED_SSR_VIRTUAL_MODULE_ID = "\0" + SSR_VIRTUAL_MODULE_ID;
 const manifestReplace = "@@ASTRO_MANIFEST_REPLACE@@";
 const replaceExp = new RegExp(`['"](${manifestReplace})['"]`, "g");
-function vitePluginSSR(internals, adapter, config) {
+function vitePluginSSR(internals, adapter, options) {
   return {
     name: "@astrojs/vite-plugin-astro-ssr",
     enforce: "post",
     options(opts) {
-      return addRollupInput(opts, [virtualModuleId]);
+      return addRollupInput(opts, [SSR_VIRTUAL_MODULE_ID]);
     },
     resolveId(id) {
-      if (id === virtualModuleId) {
-        return resolvedVirtualModuleId;
+      if (id === SSR_VIRTUAL_MODULE_ID) {
+        return RESOLVED_SSR_VIRTUAL_MODULE_ID;
       }
     },
-    load(id) {
+    async load(id) {
       var _a;
-      if (id === resolvedVirtualModuleId) {
-        let middleware = "";
+      if (id === RESOLVED_SSR_VIRTUAL_MODULE_ID) {
+        const {
+          settings: { config },
+          allPages
+        } = options;
+        const imports = [];
+        const contents = [];
+        const exports = [];
+        let middleware;
         if (((_a = config.experimental) == null ? void 0 : _a.middleware) === true) {
-          middleware = "middleware: _main.middleware";
+          imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}"`);
+          middleware = "middleware: _middleware";
         }
-        return `import * as adapter from '${adapter.serverEntrypoint}';
+        let i = 0;
+        const pageMap = [];
+        for (const path of Object.keys(allPages)) {
+          const virtualModuleName = getVirtualModulePageNameFromPath(path);
+          let module = await this.resolve(virtualModuleName);
+          if (module) {
+            const variable = `_page${i}`;
+            imports.push(`const ${variable}  = () => import("${virtualModuleName}");`);
+            const pageData = internals.pagesByComponent.get(path);
+            if (pageData) {
+              pageMap.push(`[${JSON.stringify(pageData.component)}, ${variable}]`);
+            }
+            i++;
+          }
+        }
+        contents.push(`const pageMap = new Map([${pageMap.join(",")}]);`);
+        exports.push(`export { pageMap }`);
+        const content = `import * as adapter from '${adapter.serverEntrypoint}';
 import { renderers } from '${RENDERERS_MODULE_ID}'; 
-import * as _main from '${pagesVirtualModuleId}';
 import { deserializeManifest as _deserializeManifest } from 'astro/app';
 import { _privateSetManifestDontUseThis } from 'astro:ssr-manifest';
 const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
-	pageMap: _main.pageMap,
-	renderers: _main.renderers,
+	pageMap,
+	renderers,
 	${middleware}
 });
 _privateSetManifestDontUseThis(_manifest);
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : "undefined"};
-export * from '${pagesVirtualModuleId}';
+
 ${adapter.exports ? `const _exports = adapter.createExports(_manifest, _args);
 ${adapter.exports.map((name) => {
           if (name === "default") {
@@ -60,6 +85,7 @@ const _start = 'start';
 if(_start in adapter) {
 	adapter[_start](_manifest, _args);
 }`;
+        return `${imports.join("\n")}${contents.join("\n")}${content}${exports.join("\n")}`;
       }
       return void 0;
     },
@@ -73,7 +99,7 @@ if(_start in adapter) {
         if (chunk.type === "asset") {
           continue;
         }
-        if (chunk.modules[resolvedVirtualModuleId]) {
+        if (chunk.modules[RESOLVED_SSR_VIRTUAL_MODULE_ID]) {
           internals.ssrEntryChunk = chunk;
           delete bundle[chunkName];
         }
@@ -196,7 +222,7 @@ function pluginSSR(options, internals) {
     build: "ssr",
     hooks: {
       "build:before": () => {
-        let vitePlugin = ssr ? vitePluginSSR(internals, options.settings.adapter, options.settings.config) : void 0;
+        let vitePlugin = ssr ? vitePluginSSR(internals, options.settings.adapter, options) : void 0;
         return {
           enforce: "after-user-plugins",
           vitePlugin
@@ -217,7 +243,7 @@ function pluginSSR(options, internals) {
   };
 }
 export {
+  SSR_VIRTUAL_MODULE_ID,
   injectManifest,
-  pluginSSR,
-  virtualModuleId
+  pluginSSR
 };

package/dist/core/build/static-build.js

@@ -16,7 +16,6 @@ import { isModeServerWithNoAdapter } from "../../core/util.js";
 import { runHookBuildSetup } from "../../integrations/index.js";
 import { isHybridOutput } from "../../prerender/utils.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-import { resolvedPagesVirtualModuleId } from "../app/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { info } from "../logger/core.js";
 import { getOutDirWithinCwd } from "./common.js";
@@ -24,8 +23,12 @@ import { generatePages } from "./generate.js";
 import { trackPageData } from "./internal.js";
 import { createPluginContainer } from "./plugin.js";
 import { registerAllPlugins } from "./plugins/index.js";
-import { RESOLVED_MIDDLEWARE_MODULE_ID } from "./plugins/plugin-middleware.js";
+import {
+  ASTRO_PAGE_EXTENSION_POST_PATTERN,
+  ASTRO_PAGE_RESOLVED_MODULE_ID
+} from "./plugins/plugin-pages.js";
 import { RESOLVED_RENDERERS_MODULE_ID } from "./plugins/plugin-renderers.js";
+import { SSR_VIRTUAL_MODULE_ID } from "./plugins/plugin-ssr.js";
 import { getTimeStat } from "./util.js";
 async function viteBuild(opts) {
   var _a, _b, _c;
@@ -129,10 +132,17 @@ async function ssrBuild(opts, internals, input, container) {
           assetFileNames: `${settings.config.build.assets}/[name].[hash][extname]`,
           ...(_e = (_d = viteConfig.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output,
           entryFileNames(chunkInfo) {
-            if (chunkInfo.facadeModuleId === resolvedPagesVirtualModuleId) {
-              return opts.buildConfig.serverEntry;
-            } else if (chunkInfo.facadeModuleId === RESOLVED_MIDDLEWARE_MODULE_ID) {
+            var _a2, _b2;
+            if ((_a2 = chunkInfo.facadeModuleId) == null ? void 0 : _a2.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {
+              return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId);
+            } else if (
+              // checks if the path of the module we have middleware, e.g. middleware.js / middleware/index.js
+              ((_b2 = chunkInfo.facadeModuleId) == null ? void 0 : _b2.includes("middleware")) && // checks if the file actually export the `onRequest` function
+              chunkInfo.exports.includes("onRequest")
+            ) {
               return "middleware.mjs";
+            } else if (chunkInfo.facadeModuleId === SSR_VIRTUAL_MODULE_ID) {
+              return opts.settings.config.build.serverEntry;
             } else if (chunkInfo.facadeModuleId === RESOLVED_RENDERERS_MODULE_ID) {
               return "renderers.mjs";
             } else {
@@ -315,6 +325,9 @@ async function ssrMoveAssets(opts) {
     removeEmptyDirs(serverAssets);
   }
 }
+function makeAstroPageEntryPointFileName(facadeModuleId) {
+  return `${facadeModuleId.replace(ASTRO_PAGE_RESOLVED_MODULE_ID, "").replace("src/", "").replaceAll("[", "_").replaceAll("]", "_").replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, ".")}.mjs`;
+}
 export {
   staticBuild,
   viteBuild

package/dist/core/build/types.d.ts

@@ -44,8 +44,8 @@ export interface StaticBuildOptions {
     teardownCompiler: boolean;
 }
 type ImportComponentInstance = () => Promise<ComponentInstance>;
-export interface SingleFileBuiltModule {
-    pageMap: Map<ComponentPath, ImportComponentInstance>;
+export interface SinglePageBuiltModule {
+    page: ImportComponentInstance;
     middleware: AstroMiddlewareInstance<unknown>;
     renderers: SSRLoadedRenderer[];
 }