Skip to content

Revert "fix(build): Prevent duplicate CSS for hydrated client components" #14612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ematipico merged 3 commits into from
Oct 23, 2025
Merged

Revert "fix(build): Prevent duplicate CSS for hydrated client components" #14612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d924e9
Revert "fix(build): Prevent duplicate CSS for hydrated client compone…
ematipico Oct 23, 2025
5100790
revert: regression introduced by orphan CSS fix
ematipico Oct 23, 2025
9f3ee6e
Update .changeset/puny-yaks-retire.md
ematipico Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/puny-yaks-retire.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes a regression introduced in Astro v5.14.7 that caused `?url` imports to not work correctly. This release reverts [#14142](https://github.com/withastro/astro/pull/14142).
14 changes: 3 additions & 11 deletions packages/astro/src/core/build/plugins/plugin-css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
// and that's okay. We can use Rollup's default chunk strategy instead as these CSS
// are outside of the SSR build scope, which no dedupe is needed.
if (options.target === 'client') {
// Find the chunkId for this CSS module in the server build.
// If it exists, we can use it to ensure the client build matches the server
// build and doesn't create a duplicate chunk.
return internals.cssModuleToChunkIdMap.get(id);
return internals.cssModuleToChunkIdMap.get(id)!;
}

const ctx = { getModuleInfo: meta.getModuleInfo };
Expand All @@ -96,7 +93,6 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
return chunkId;
}
}

const chunkId = createNameForParentPages(id, meta);
internals.cssModuleToChunkIdMap.set(id, chunkId);
return chunkId;
Expand Down Expand Up @@ -234,12 +230,8 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
sheetAddedToPage = true;
}

const wasInlined = toBeInlined && sheetAddedToPage;
const isOrphaned = !sheetAddedToPage;
if (wasInlined || isOrphaned) {
// wasInlined : CSS is already added to all used pages
// isOrphaned : CSS is already used in a merged chunk
// we can delete it from the bundle
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];
Expand Down
81 changes: 0 additions & 81 deletions packages/astro/test/css-deduplication.test.js
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions packages/astro/test/fixtures/css-deduplication/astro.config.mjs
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions packages/astro/test/fixtures/css-deduplication/package.json
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions packages/astro/test/fixtures/css-deduplication/src/components/Counter.css
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions packages/astro/test/fixtures/css-deduplication/src/components/Counter.tsx
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions packages/astro/test/fixtures/css-deduplication/src/pages/index.astro
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions packages/astro/test/fixtures/css-deduplication/tsconfig.json
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading