Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

internals: getPageDatasWithPublicKey

Browse source
This commit is contained in:
Goulven Clec'h 2024-04-25 16:00:57 +02:00
parent b3ccdfb12c
commit 2423ac2b1a
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
packages/astro/src/core/build/internal.ts
View file

@ -246,6 +246,45 @@ export function getPageDataByComponent(
return undefined;
}
/**
* TODO: This function is used to avoid breaking changes in the Integrations API.
* Should be removed in the future (in Astro 5 ?).
* Parse internals.pagesByKeys to get the page data with the public key.
* If the page component is unique -> the public key is the component.
* If the page component is shared -> the public key is the internal key.
* @param pagesByKeys A map of all page data by their internal key
*/
export function getPageDatasWithPublicKey(pagesByKeys: Map<string, PageBuildData>): Map<string, PageBuildData> {
// Create a map to store the pages with the public key, mimicking internal.pagesByKeys
const pagesWithPublicKey = new Map<string, PageBuildData>();
const pagesByComponentsArray = Array.from(pagesByKeys.values()).map((pageData) => {
return { component: pageData.component, pageData: pageData };
});
// Get pages with unique component, and set the public key to the component, to maintain the
// old behavior of the Integrations API. Then add them to the pagesWithPublicKey map.
const pagesWithUniqueComponent = pagesByComponentsArray.filter((page) => {
return pagesByComponentsArray.filter((p) => p.component === page.component).length === 1;
});
pagesWithUniqueComponent.forEach((page) => {
pagesWithPublicKey.set(page.component, page.pageData);
});
// Get pages with shared component, and set the public key to the internal key. It's not a breaking change
// since having a shared component was not supported before. Then add them to the pagesWithPublicKey map.
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;
}
export function getPageDataByViteID(
internals: BuildInternals,
viteid: ViteID

7
packages/astro/src/core/build/static-build.ts
View file

@ -9,7 +9,7 @@ import * as vite from 'vite';
import type { RouteData } from '../../@types/astro.js';
import { PROPAGATED_ASSET_FLAG } from '../../content/consts.js';
import { hasAnyContentFlag } from '../../content/utils.js';
import { type BuildInternals, createBuildInternals } from '../../core/build/internal.js';
import { type BuildInternals, createBuildInternals, getPageDatasWithPublicKey } from '../../core/build/internal.js';
import { emptyDir, removeEmptyDirs } from '../../core/fs/index.js';
import { appendForwardSlash, prependForwardSlash, removeFileExtension } from '../../core/path.js';
import { isModeServerWithNoAdapter } from '../../core/util.js';
@ -267,7 +267,7 @@ async function ssrBuild(
const updatedViteBuildConfig = await runHookBuildSetup({
config: settings.config,
pages: internals.pagesByKeys,
pages: getPageDatasWithPublicKey(internals.pagesByKeys),
vite: viteBuildConfig,
target: 'server',
logger: opts.logger,
@ -328,7 +328,7 @@ async function clientBuild(
await runHookBuildSetup({
config: settings.config,
pages: internals.pagesByKeys,
pages: getPageDatasWithPublicKey(internals.pagesByKeys),
vite: viteBuildConfig,
target: 'client',
logger: opts.logger,
@ -370,7 +370,6 @@ async function cleanStaticOutput(
) {
const allStaticFiles = new Set();
for (const pageData of internals.pagesByKeys.values()) {
console.log("[cleanStaticOutput] pageData: ", pageData.key, "— is prerender ? ", pageData.route.prerender);
const { moduleSpecifier } = pageData;
const pageBundleId = internals.pageToBundleMap.get(moduleSpecifier);
const entryBundleId = internals.entrySpecifierToBundleMap.get(moduleSpecifier);