From aa265d73024422967c1b1c68ad268c419c6c798f Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Wed, 4 Oct 2023 21:18:39 +0800 Subject: [PATCH] Remove unused CSS output files when inlined (#8743) --- .changeset/tasty-meals-buy.md | 5 +++++ .../src/core/build/plugins/plugin-css.ts | 22 +++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .changeset/tasty-meals-buy.md diff --git a/.changeset/tasty-meals-buy.md b/.changeset/tasty-meals-buy.md new file mode 100644 index 000000000..1df456b68 --- /dev/null +++ b/.changeset/tasty-meals-buy.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Remove unused CSS output files when inlined diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts index d85dc8e56..85652e13b 100644 --- a/packages/astro/src/core/build/plugins/plugin-css.ts +++ b/packages/astro/src/core/build/plugins/plugin-css.ts @@ -200,7 +200,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] { const inlineConfig = settings.config.build.inlineStylesheets; const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {}; - Object.entries(bundle).forEach(([_, stylesheet]) => { + Object.entries(bundle).forEach(([id, stylesheet]) => { if ( stylesheet.type !== 'asset' || stylesheet.name?.endsWith('.css') !== true || @@ -224,10 +224,15 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] { : { type: 'external', src: stylesheet.fileName }; const pages = Array.from(eachPageData(internals)); + let sheetAddedToPage = false; pages.forEach((pageData) => { const orderingInfo = pagesToCss[pageData.moduleSpecifier]?.[stylesheet.fileName]; - if (orderingInfo !== undefined) return pageData.styles.push({ ...orderingInfo, sheet }); + if (orderingInfo !== undefined) { + pageData.styles.push({ ...orderingInfo, sheet }); + sheetAddedToPage = true; + return; + } const propagatedPaths = pagesToPropagatedCss[pageData.moduleSpecifier]; if (propagatedPaths === undefined) return; @@ -243,8 +248,21 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] { pageData.propagatedStyles.set(pageInfoId, new Set()).get(pageInfoId)!; propagatedStyles.add(sheet); + sheetAddedToPage = true; }); }); + + if (toBeInlined && sheetAddedToPage) { + // CSS is already added to all used pages, we can delete it from the bundle + // and make sure no chunks reference it via `importedCss` (for Vite preloading) + // to avoid duplicate CSS. + delete bundle[id]; + for (const chunk of Object.values(bundle)) { + if (chunk.type === 'chunk') { + chunk.viteMetadata?.importedCss?.delete(id); + } + } + } }); }, };