astro 4.7.1 → 4.8.0

package/dist/core/build/generate.js

@@ -18,60 +18,24 @@ import {
 } from "../../core/path.js";
 import { toRoutingStrategy } from "../../i18n/utils.js";
 import { runHookBuildGenerated } from "../../integrations/hooks.js";
-import { getOutputDirectory, isServerLikeOutput } from "../../prerender/utils.js";
+import { getOutputDirectory } from "../../prerender/utils.js";
 import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
-import { routeIsFallback } from "../redirects/helpers.js";
-import {
-  RedirectSinglePageBuiltModule,
-  getRedirectLocationOrThrow,
-  routeIsRedirect
-} from "../redirects/index.js";
+import { getRedirectLocationOrThrow, routeIsRedirect } from "../redirects/index.js";
 import { RenderContext } from "../render-context.js";
 import { callGetStaticPaths } from "../render/route-cache.js";
 import { createRequest } from "../request.js";
 import { matchRoute } from "../routing/match.js";
-import { getOutputFilename } from "../util.js";
+import { getOutputFilename, isServerLikeOutput } from "../util.js";
 import { getOutDirWithinCwd, getOutFile, getOutFolder } from "./common.js";
-import {
-  cssOrder,
-  getEntryFilePathFromComponentPath,
-  getPageDataByComponent,
-  mergeInlineCss
-} from "./internal.js";
+import { cssOrder, mergeInlineCss } from "./internal.js";
 import { BuildPipeline } from "./pipeline.js";
+import { ASTRO_PAGE_MODULE_ID } from "./plugins/plugin-pages.js";
+import { getVirtualModulePageName } from "./plugins/util.js";
 import { getTimeStat, shouldAppendForwardSlash } from "./util.js";
 function createEntryURL(filePath, outFolder) {
   return new URL("./" + filePath + `?time=${Date.now()}`, outFolder);
 }
-async function getEntryForRedirectRoute(route, internals, outFolder) {
-  if (route.type !== "redirect") {
-    throw new Error(`Expected a redirect route.`);
-  }
-  if (route.redirectRoute) {
-    const filePath = getEntryFilePathFromComponentPath(internals, route.redirectRoute.component);
-    if (filePath) {
-      const url = createEntryURL(filePath, outFolder);
-      const ssrEntryPage = await import(url.toString());
-      return ssrEntryPage;
-    }
-  }
-  return RedirectSinglePageBuiltModule;
-}
-async function getEntryForFallbackRoute(route, internals, outFolder) {
-  if (route.type !== "fallback") {
-    throw new Error(`Expected a redirect route.`);
-  }
-  if (route.redirectRoute) {
-    const filePath = getEntryFilePathFromComponentPath(internals, route.redirectRoute.component);
-    if (filePath) {
-      const url = createEntryURL(filePath, outFolder);
-      const ssrEntryPage = await import(url.toString());
-      return ssrEntryPage;
-    }
-  }
-  return RedirectSinglePageBuiltModule;
-}
 function rootRelativeFacadeId(facadeId, settings) {
   return facadeId.slice(fileURLToPath(settings.config.root).length);
 }
@@ -133,13 +97,13 @@ ${bgGreen(black(` ${verb} static routes `))}`);
             message: NoPrerenderedRoutesWithDomains.message(pageData.component)
           });
         }
-        const ssrEntryURLPage = createEntryURL(filePath, outFolder);
-        const ssrEntryPage = await import(ssrEntryURLPage.toString());
+        const ssrEntryPage = await pipeline.retrieveSsrEntry(pageData.route, filePath);
         if (options.settings.adapter?.adapterFeatures?.functionPerRoute) {
           const ssrEntry = ssrEntryPage?.pageModule;
           if (ssrEntry) {
             await generatePage(pageData, ssrEntry, builtPaths, pipeline);
           } else {
+            const ssrEntryURLPage = createEntryURL(filePath, outFolder);
             throw new Error(
               `Unable to find the manifest for the module ${ssrEntryURLPage.toString()}. This is unexpected and likely a bug in Astro, please report.`
             );
@@ -152,17 +116,8 @@ ${bgGreen(black(` ${verb} static routes `))}`);
     }
   } else {
     for (const [pageData, filePath] of pagesToGenerate) {
-      if (routeIsRedirect(pageData.route)) {
-        const entry = await getEntryForRedirectRoute(pageData.route, internals, outFolder);
-        await generatePage(pageData, entry, builtPaths, pipeline);
-      } else if (routeIsFallback(pageData.route)) {
-        const entry = await getEntryForFallbackRoute(pageData.route, internals, outFolder);
-        await generatePage(pageData, entry, builtPaths, pipeline);
-      } else {
-        const ssrEntryURLPage = createEntryURL(filePath, outFolder);
-        const entry = await import(ssrEntryURLPage.toString());
-        await generatePage(pageData, entry, builtPaths, pipeline);
-      }
+      const entry = await pipeline.retrieveSsrEntry(pageData.route, filePath);
+      await generatePage(pageData, entry, builtPaths, pipeline);
     }
   }
   logger.info(
@@ -175,11 +130,11 @@ ${bgGreen(black(` ${verb} static routes `))}`);
     logger.info("SKIP_FORMAT", `${bgGreen(black(` generating optimized images `))}`);
     const totalCount = Array.from(staticImageList.values()).map((x) => x.transforms.size).reduce((a, b) => a + b, 0);
     const cpuCount = os.cpus().length;
-    const assetsCreationpipeline = await prepareAssetsGenerationEnv(pipeline, totalCount);
+    const assetsCreationPipeline = await prepareAssetsGenerationEnv(pipeline, totalCount);
     const queue = new PQueue({ concurrency: Math.max(cpuCount, 1) });
     const assetsTimer = performance.now();
     for (const [originalPath, transforms] of staticImageList) {
-      await generateImagesForPath(originalPath, transforms, assetsCreationpipeline, queue);
+      await generateImagesForPath(originalPath, transforms, assetsCreationPipeline, queue);
     }
     await queue.onIdle();
     const assetsTimeEnd = performance.now();
@@ -192,10 +147,9 @@ ${bgGreen(black(` ${verb} static routes `))}`);
 async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
   const { config, internals, logger } = pipeline;
   const pageModulePromise = ssrEntry.page;
-  const pageInfo = getPageDataByComponent(internals, pageData.route.component);
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
   const linkIds = [];
-  const scripts = pageInfo?.hoistedScript ?? null;
+  const scripts = pageData.hoistedScript ?? null;
   if (!pageModulePromise) {
     throw new Error(
       `Unable to find the module for ${pageData.component}. This is unexpected and likely a bug in Astro, please report.`
@@ -387,8 +341,7 @@ async function generatePath(pathname, pipeline, gopts, route) {
       route.redirect = location.toString();
     }
   } else {
-    if (!response.body)
-      return;
+    if (!response.body) return;
     body = Buffer.from(await response.arrayBuffer());
   }
   const outFolder = getOutFolder(config, pathname, route);
@@ -434,6 +387,7 @@ function createBuildManifest(settings, internals, renderers, middleware) {
     i18n: i18nManifest,
     buildFormat: settings.config.build.format,
     middleware,
+    rewritingEnabled: settings.config.experimental.rewriting,
     checkOrigin: settings.config.experimental.security?.csrfProtection?.origin ?? false
   };
 }

package/dist/core/build/index.js

@@ -11,7 +11,6 @@ import {
   runHookConfigDone,
   runHookConfigSetup
 } from "../../integrations/hooks.js";
-import { isServerLikeOutput } from "../../prerender/utils.js";
 import { resolveConfig } from "../config/config.js";
 import { createNodeLogger } from "../config/logging.js";
 import { createSettings } from "../config/settings.js";
@@ -19,7 +18,7 @@ import { createVite } from "../create-vite.js";
 import { levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { createRouteManifest } from "../routing/index.js";
-import { ensureProcessNodeEnv } from "../util.js";
+import { ensureProcessNodeEnv, isServerLikeOutput } from "../util.js";
 import { collectPagesData } from "./page-data.js";
 import { staticBuild, viteBuild } from "./static-build.js";
 import { getTimeStat } from "./util.js";
@@ -134,8 +133,7 @@ class AstroBuilder {
     await staticBuild(opts, internals, ssrOutputChunkNames);
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
-      if (!assets[k])
-        return;
+      if (!assets[k]) return;
       const filePath = new URL(`file://${k}`);
       fs.mkdirSync(new URL("./", filePath), { recursive: true });
       fs.writeFileSync(filePath, assets[k], "utf8");

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

@@ -1,7 +1,7 @@
 import type { Rollup } from 'vite';
 import type { RouteData, SSRResult } from '../../@types/astro.js';
 import type { PageOptions } from '../../vite-plugin-astro/types.js';
-import type { AllPagesData, PageBuildData, StylesheetAsset, ViteID } from './types.js';
+import type { PageBuildData, StylesheetAsset, ViteID } from './types.js';
 export interface BuildInternals {
     /**
      * Each CSS module is named with a chunk id derived from the Astro pages they
@@ -27,7 +27,7 @@ export interface BuildInternals {
     /**
      * A map for page-specific information.
      */
-    pagesByComponent: Map<string, PageBuildData>;
+    pagesByKeys: Map<string, PageBuildData>;
     /**
      * A map for page-specific output.
      */
@@ -67,7 +67,15 @@ export interface BuildInternals {
     discoveredScripts: Set<string>;
     cachedClientEntries: string[];
     cacheManifestUsed: boolean;
+    /**
+     * Map of propagated module ids (usually something like `/Users/...blog.mdx?astroPropagatedAssets`)
+     * to a set of stylesheets that it uses.
+     */
     propagatedStylesMap: Map<string, Set<StylesheetAsset>>;
+    /**
+     * Map of propagated module ids (usually something like `/Users/...blog.mdx?astroPropagatedAssets`)
+     * to a set of hoisted scripts that it uses.
+     */
     propagatedScriptsMap: Map<string, Set<string>>;
     staticFiles: Set<string>;
     ssrEntryChunk?: Rollup.OutputChunk;
@@ -90,12 +98,31 @@ export declare function trackPageData(internals: BuildInternals, component: stri
 export declare function trackClientOnlyPageDatas(internals: BuildInternals, pageData: PageBuildData, clientOnlys: string[]): void;
 export declare function getPageDatasByChunk(internals: BuildInternals, chunk: Rollup.RenderedChunk): Generator<PageBuildData, void, unknown>;
 export declare function getPageDatasByClientOnlyID(internals: BuildInternals, viteid: ViteID): Generator<PageBuildData, void, unknown>;
-export declare function getPageDataByComponent(internals: BuildInternals, component: string): PageBuildData | undefined;
+/**
+ * From its route and component, get the page data from the build internals.
+ * @param internals Build Internals with all the pages
+ * @param route The route of the page, used to identify the page
+ * @param component The component of the page, used to identify the page
+ */
+export declare function getPageData(internals: BuildInternals, route: string, component: string): PageBuildData | undefined;
+/**
+ * Get all pages datas from the build internals, using a specific component.
+ * @param internals Build Internals with all the pages
+ * @param component path to the component, used to identify related pages
+ */
+export declare function getPagesDatasByComponent(internals: BuildInternals, component: string): PageBuildData[];
+/**
+ * Map internals.pagesByKeys to a new map with the public key instead of the internal key.
+ * This function is only used to avoid breaking changes in the Integrations API, after we changed the way
+ * we identify pages, from the entrypoint component to an internal key.
+ * If the page component is unique -> the public key is the component path. (old behavior)
+ * If the page component is shared -> the public key is the internal key. (new behavior)
+ * The new behavior on shared entrypoint it's not a breaking change, because it was not supported before.
+ * @param pagesByKeys A map of all page data by their internal key
+ */
+export declare function getPageDatasWithPublicKey(pagesByKeys: Map<string, PageBuildData>): Map<string, PageBuildData>;
 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 eachPageFromAllPages(allPages: AllPagesData): Generator<[string, PageBuildData]>;
-export declare function eachPageDataFromEntryPoint(internals: BuildInternals): Generator<[PageBuildData, string]>;
 export declare function hasPrerenderedPages(internals: BuildInternals): boolean;
 interface OrderInfo {
     depth: number;
@@ -109,7 +136,10 @@ interface OrderInfo {
  */
 export declare function cssOrder(a: OrderInfo, b: OrderInfo): 1 | -1;
 export declare function mergeInlineCss(acc: Array<StylesheetAsset>, current: StylesheetAsset): Array<StylesheetAsset>;
-export declare function isHoistedScript(internals: BuildInternals, id: string): boolean;
-export declare function getPageDatasByHoistedScriptId(internals: BuildInternals, id: string): Generator<PageBuildData, void, unknown>;
-export declare function getEntryFilePathFromComponentPath(internals: BuildInternals, path: string): string | undefined;
+/**
+ * Get all pages data from the build internals, using a specific hoisted script id.
+ * @param internals Build Internals with all the pages
+ * @param id Hoisted script id, used to identify the pages using it
+ */
+export declare function getPageDatasByHoistedScriptId(internals: BuildInternals, id: string): PageBuildData[];
 export {};

package/dist/core/build/internal.js

@@ -1,11 +1,6 @@
 import { prependForwardSlash, removeFileExtension } from "../path.js";
 import { viteID } from "../util.js";
-import {
-  ASTRO_PAGE_RESOLVED_MODULE_ID,
-  getVirtualModulePageIdFromPath
-} from "./plugins/plugin-pages.js";
-import { RESOLVED_SPLIT_MODULE_ID } from "./plugins/plugin-ssr.js";
-import { ASTRO_PAGE_EXTENSION_POST_PATTERN } from "./plugins/util.js";
+import { makePageDataKey } from "./plugins/util.js";
 function createBuildInternals() {
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToPagesMap = /* @__PURE__ */ new Map();
@@ -17,7 +12,7 @@ function createBuildInternals() {
     inlinedScripts: /* @__PURE__ */ new Map(),
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
     pageToBundleMap: /* @__PURE__ */ new Map(),
-    pagesByComponent: /* @__PURE__ */ new Map(),
+    pagesByKeys: /* @__PURE__ */ new Map(),
     pageOptionsByPage: /* @__PURE__ */ new Map(),
     pagesByViteID: /* @__PURE__ */ new Map(),
     pagesByClientOnly: /* @__PURE__ */ new Map(),
@@ -35,7 +30,7 @@ function createBuildInternals() {
 }
 function trackPageData(internals, component, pageData, componentModuleId, componentURL) {
   pageData.moduleSpecifier = componentModuleId;
-  internals.pagesByComponent.set(component, pageData);
+  internals.pagesByKeys.set(pageData.key, pageData);
   internals.pagesByViteID.set(viteID(componentURL), pageData);
 }
 function trackClientOnlyPageDatas(internals, pageData, clientOnlys) {
@@ -77,12 +72,39 @@ function* getPageDatasByClientOnlyID(internals, viteid) {
     }
   }
 }
-function getPageDataByComponent(internals, component) {
-  if (internals.pagesByComponent.has(component)) {
-    return internals.pagesByComponent.get(component);
+function getPageData(internals, route, component) {
+  let pageData = internals.pagesByKeys.get(makePageDataKey(route, component));
+  if (pageData) {
+    return pageData;
   }
   return void 0;
 }
+function getPagesDatasByComponent(internals, component) {
+  const pageDatas = [];
+  internals.pagesByKeys.forEach((pageData) => {
+    if (component === pageData.component) pageDatas.push(pageData);
+  });
+  return pageDatas;
+}
+function getPageDatasWithPublicKey(pagesByKeys) {
+  const pagesWithPublicKey = /* @__PURE__ */ new Map();
+  const pagesByComponentsArray = Array.from(pagesByKeys.values()).map((pageData) => {
+    return { component: pageData.component, pageData };
+  });
+  const pagesWithUniqueComponent = pagesByComponentsArray.filter((page) => {
+    return pagesByComponentsArray.filter((p) => p.component === page.component).length === 1;
+  });
+  pagesWithUniqueComponent.forEach((page) => {
+    pagesWithPublicKey.set(page.component, page.pageData);
+  });
+  const pagesWithSharedComponent = pagesByComponentsArray.filter((page) => {
+    return pagesByComponentsArray.filter((p) => p.component === page.component).length > 1;
+  });
+  pagesWithSharedComponent.forEach((page) => {
+    pagesWithPublicKey.set(page.pageData.key, page.pageData);
+  });
+  return pagesWithPublicKey;
+}
 function getPageDataByViteID(internals, viteid) {
   if (internals.pagesByViteID.has(viteid)) {
     return internals.pagesByViteID.get(viteid);
@@ -92,32 +114,8 @@ function getPageDataByViteID(internals, viteid) {
 function hasPageDataByViteID(internals, viteid) {
   return internals.pagesByViteID.has(viteid);
 }
-function* eachPageData(internals) {
-  yield* internals.pagesByComponent.values();
-}
-function* eachPageFromAllPages(allPages) {
-  for (const [path, pageData] of Object.entries(allPages)) {
-    yield [path, pageData];
-  }
-}
-function* eachPageDataFromEntryPoint(internals) {
-  for (const [entrypoint, filePath] of internals.entrySpecifierToBundleMap) {
-    if (entrypoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) || entrypoint.includes(RESOLVED_SPLIT_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)) {
+  for (const pageData of internals.pagesByKeys.values()) {
     if (pageData.route.prerender) {
       return true;
     }
@@ -156,39 +154,30 @@ function mergeInlineCss(acc, current) {
   acc.push(current);
   return acc;
 }
-function isHoistedScript(internals, id) {
-  return internals.hoistedScriptIdToPagesMap.has(id);
-}
-function* getPageDatasByHoistedScriptId(internals, id) {
+function getPageDatasByHoistedScriptId(internals, id) {
   const set = internals.hoistedScriptIdToPagesMap.get(id);
+  const pageDatas = [];
   if (set) {
     for (const pageId of set) {
-      const pageData = getPageDataByComponent(internals, pageId.slice(1));
-      if (pageData) {
-        yield pageData;
-      }
+      getPagesDatasByComponent(internals, pageId.slice(1)).forEach((pageData) => {
+        pageDatas.push(pageData);
+      });
     }
   }
-}
-function getEntryFilePathFromComponentPath(internals, path) {
-  const id = getVirtualModulePageIdFromPath(path);
-  return internals.entrySpecifierToBundleMap.get(id);
+  return pageDatas;
 }
 export {
   createBuildInternals,
   cssOrder,
-  eachPageData,
-  eachPageDataFromEntryPoint,
-  eachPageFromAllPages,
-  getEntryFilePathFromComponentPath,
-  getPageDataByComponent,
+  getPageData,
   getPageDataByViteID,
   getPageDatasByChunk,
   getPageDatasByClientOnlyID,
   getPageDatasByHoistedScriptId,
+  getPageDatasWithPublicKey,
+  getPagesDatasByComponent,
   hasPageDataByViteID,
   hasPrerenderedPages,
-  isHoistedScript,
   mergeInlineCss,
   trackClientOnlyPageDatas,
   trackPageData

package/dist/core/build/page-data.js

@@ -1,5 +1,6 @@
 import * as colors from "kleur/colors";
 import { debug } from "../logger/core.js";
+import { makePageDataKey } from "./plugins/util.js";
 async function collectPagesData(opts) {
   const { settings, manifest } = opts;
   const assets = {};
@@ -10,6 +11,7 @@ async function collectPagesData(opts) {
     clearInterval(dataCollectionLogTimeout);
   }, 3e4);
   for (const route of manifest.routes) {
+    const key = makePageDataKey(route.route, route.component);
     if (route.pathname) {
       const routeCollectionLogTimeout = setInterval(() => {
         opts.logger.info(
@@ -21,13 +23,12 @@ async function collectPagesData(opts) {
         clearInterval(routeCollectionLogTimeout);
       }, 1e4);
       builtPaths.add(route.pathname);
-      allPages[route.component] = {
+      allPages[key] = {
+        key,
         component: route.component,
         route,
         moduleSpecifier: "",
         styles: [],
-        propagatedStyles: /* @__PURE__ */ new Map(),
-        propagatedScripts: /* @__PURE__ */ new Map(),
         hoistedScript: void 0,
         hasSharedModules: false
       };
@@ -43,13 +44,12 @@ async function collectPagesData(opts) {
       }
       continue;
     }
-    allPages[route.component] = {
+    allPages[key] = {
+      key,
       component: route.component,
       route,
       moduleSpecifier: "",
       styles: [],
-      propagatedStyles: /* @__PURE__ */ new Map(),
-      propagatedScripts: /* @__PURE__ */ new Map(),
       hoistedScript: void 0,
       hasSharedModules: false
     };

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

@@ -1,17 +1,19 @@
-import type { RouteData, SSRResult } from '../../@types/astro.js';
+import type { ComponentInstance, RewritePayload, RouteData, SSRResult } from '../../@types/astro.js';
 import type { SSRManifest } from '../app/types.js';
 import { Pipeline } from '../render/index.js';
 import { type BuildInternals } from './internal.js';
-import type { PageBuildData, StaticBuildOptions } from './types.js';
+import type { PageBuildData, SinglePageBuiltModule, StaticBuildOptions } from './types.js';
 /**
  * The build pipeline is responsible to gather the files emitted by the SSR build and generate the pages by executing these files.
  */
 export declare class BuildPipeline extends Pipeline {
+    #private;
     readonly internals: BuildInternals;
     readonly manifest: SSRManifest;
     readonly options: StaticBuildOptions;
     readonly config: import("../../@types/astro.js").AstroConfig;
     readonly settings: import("../../@types/astro.js").AstroSettings;
+    get outFolder(): URL;
     private constructor();
     static create({ internals, manifest, options, }: Pick<BuildPipeline, 'internals' | 'manifest' | 'options'>): BuildPipeline;
     /**
@@ -32,8 +34,10 @@ export declare class BuildPipeline extends Pipeline {
     componentMetadata(): void;
     /**
      * It collects the routes to generate during the build.
-     *
      * It returns a map of page information and their relative entry point as a string.
      */
     retrieveRoutesToGenerate(): Map<PageBuildData, string>;
+    getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
+    tryRewrite(payload: RewritePayload): Promise<[RouteData, ComponentInstance]>;
+    retrieveSsrEntry(route: RouteData, filePath: string): Promise<SinglePageBuiltModule>;
 }