From c84d72c3eb66450a0570c8fbedb875b286142fd9 Mon Sep 17 00:00:00 2001 From: Goulven Clec'h Date: Mon, 29 Apr 2024 14:55:54 +0200 Subject: [PATCH] fix: concat & array.from --- packages/astro/src/core/build/internal.ts | 2 +- packages/astro/src/core/build/pipeline.ts | 5 ++--- packages/astro/src/core/build/plugins/plugin-css.ts | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts index 952ea2c343..23ac90f392 100644 --- a/packages/astro/src/core/build/internal.ts +++ b/packages/astro/src/core/build/internal.ts @@ -242,7 +242,7 @@ export function getPagesDatasByComponent( component: string ): PageBuildData[] { const pageDatas: PageBuildData[] = []; - Array.from(internals.pagesByKeys.values()).forEach((pageData) => { + internals.pagesByKeys.forEach((pageData) => { if (component === pageData.component) pageDatas.push(pageData); }) return pageDatas; diff --git a/packages/astro/src/core/build/pipeline.ts b/packages/astro/src/core/build/pipeline.ts index f94d969bce..e6313811a6 100644 --- a/packages/astro/src/core/build/pipeline.ts +++ b/packages/astro/src/core/build/pipeline.ts @@ -171,7 +171,6 @@ export class BuildPipeline extends Pipeline { /** * 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 { @@ -187,14 +186,14 @@ export class BuildPipeline extends Pipeline { ) { let pageDatas: PageBuildData[] = []; if (virtualModulePageName.includes(ASTRO_PAGE_RESOLVED_MODULE_ID)) { - pageDatas.concat(getPagesFromVirtualModulePageName( + pageDatas.push(...getPagesFromVirtualModulePageName( this.internals, ASTRO_PAGE_RESOLVED_MODULE_ID, virtualModulePageName )); } if (virtualModulePageName.includes(RESOLVED_SPLIT_MODULE_ID)) { - pageDatas.concat(getPagesFromVirtualModulePageName( + pageDatas.push(...getPagesFromVirtualModulePageName( this.internals, RESOLVED_SPLIT_MODULE_ID, virtualModulePageName diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts index 3e35a9bb09..db043a6b74 100644 --- a/packages/astro/src/core/build/plugins/plugin-css.ts +++ b/packages/astro/src/core/build/plugins/plugin-css.ts @@ -249,10 +249,9 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] { ? { type: 'inline', content: stylesheet.source } : { type: 'external', src: stylesheet.fileName }; - const pages = Array.from(internals.pagesByKeys.values()); let sheetAddedToPage = false; - pages.forEach((pageData) => { + internals.pagesByKeys.forEach((pageData) => { const orderingInfo = pagesToCss[pageData.moduleSpecifier]?.[stylesheet.fileName]; if (orderingInfo !== undefined) { pageData.styles.push({ ...orderingInfo, sheet });