Fixes for tests in environment branch #14865

matthewp · 2025-11-21T22:44:16Z

Changes

This fixes a variety of issues that were breaking tests. I commented inline where it felt appropriate. Explanations for individual fixes are in the commit messages which are linked individually, below.

Testing

test/ssr-manifest.test.js - 4578d2d
test/content-collections.test.js - 5fd8edf
test/config-vite.test.js - 9c3aa38
test/entry-file-names.test.js - 4509536
test/redirects.test.js - 11ab96e
test/server-islands.test.js - 15fc25e
test/css-inline-stylesheets.test.js - 8897c3e
test/css-import-as-inline.test.js - de91192
test/vitest.test.js - d5b6a76
test/serializeManifest.test.js - 7794452
test/ssr-dynamic.test.js - 59cd518
test/core-image-unconventional-settings.test.js - ce5ed6b
test/0-css.test.js - ad982c6
test/astro-global.test.js - 732cfaf
test/content-collections.test.js - 1bedc36

Docs

N/A, bug fix

changeset-bot · 2025-11-21T22:44:22Z

🦋 Changeset detected

Latest commit: b7eeccb

The changes in this PR will be included in the next version bump.

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

If the module with the server island mapping is in a chunk, need to use a parent-relative import statement to reach the server island module itself.

Properly handle isDev in the virtual module

Prod now matches dev, we default to adding a trailing slash to the Astro.request.url. Improves an annoying dev/build different in Astro 5.

Propagated styles get embedded in the JS and rendered at runtime if they are used on a page. These need to include the base, which this change makes happen.

Princesseuh

Looks great as far as I can tell!

.changeset/wet-lines-wear.md

packages/astro/src/content/vite-plugin-content-assets.ts

packages/astro/src/core/build/plugins/plugin-css.ts

ematipico · 2025-11-23T10:51:43Z

packages/astro/src/core/build/plugins/plugin-css.ts

+				// Delete empty CSS chunks. In prerender these are likely duplicates
+				// from SSR.
+				if(stylesheet.source.length === 0) {
+					delete bundle[id];
+					return;
+				}


Shouldn't we check that we're inside the prerender pipeline?

I think this should be ok. Should we leave in empty CSS chunks in the other environments?

The minor issue I see is that the comment doesn't reflect the actual code, because I can't see anything regarding "SSR" and "prerender" , so I'm not sure how to interpret the code.

ematipico · 2025-11-23T10:52:44Z

packages/astro/src/core/build/runtime.ts

+
+export function mergeInlineCss(
+	acc: Array<StylesheetAsset>,
+	current: StylesheetAsset,
+): Array<StylesheetAsset> {


Comment missing, we should explain the business logic of the function

This function already existed, it just got moved from internal.ts because it's now needed at runtime after the build pipeline refactor.

I understand that it already exists, but that doesn't mean we shouldn't improve what we already have. For example, I don't know what its business logic is.

Added a comment on what this does.

ematipico · 2025-11-23T11:18:33Z

packages/astro/src/vite-plugin-css/index.ts

+	for (const imp of imported) {
+		if (imp.id && !seen.has(imp?.id)) {
+			yield* collectCSSWithOrder(imp.id, imp, seen);
+		}
+	}


Nit: I think if we avoid the recursion and we just use a simple loop, it will get faster (debatable) and use less memory

This is the same way getStylesForURL works in main and has always worked. Crawling a graph is a very natural use-case for recursion. I have no doubt it can be done faster and am not opposed to doing so, but this branch is for fixing bugs and this is not any slower than what we currently do in Astro 5.

packages/astro/src/core/app/dev/pipeline.ts

ematipico · 2025-11-24T08:51:10Z

packages/astro/src/core/server-islands/vite-plugin-server-islands.ts

+				const isRelativeChunk = !chunk.isEntry;
+				const dots = isRelativeChunk ? '..' : '.';


I'm not sure why we needed to add this check. fileName is created by rollup, and referenceId is created using rollup APIs.

If there's a bug, it should probably be on lines 73-78, an incorrect usage of the rollup apis, or a bug in rollup.

It's needed when the module that contains the server island manifest and the server island chunks are both in the chunks folder.

chunks/ server-island-manifest.hash.mjs some-server-island.hash.mjs

fileName here would be chunks/some-server-island.hash.mjs, so the relative import would be wrong import('./chunks/some-server-island.hash.mjs.

Ideally we could avoid writing this at all and not need to emit chunks ourselves. I think that might require adding another environment though, so a larger task than we have time for at the moment.

And in which case we need the ../?

packages/astro/src/vite-plugin-css/index.ts

Co-authored-by: Emanuele Stoppa <[email protected]> Co-authored-by: Samuel Macleod <[email protected]> Co-authored-by: Alexander Niebuhr <[email protected]> Co-authored-by: ascorbic <[email protected]> Co-authored-by: matthewp <[email protected]> Co-authored-by: Florian Lefebvre <[email protected]> Co-authored-by: Matt Kane <[email protected]> Co-authored-by: florian-lefebvre <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Matthew Phillips <[email protected]> Co-authored-by: Matthew Phillips <[email protected]> Co-authored-by: Sarah Rainsberger <[email protected]> Co-authored-by: Erika <[email protected]> Co-authored-by: Hayato Hasegawa <[email protected]> fix: creation of routes list in build (#14325) Fix unit tests for environment API (#14394) fixture (#14599) fix: organize imports and formatting in cloudflare handler (#14697) fix: resolve environment-api build issues for client & CSS (#14770) Fixes CSS when both static/client styles exist (#14790) fix: flag `serverLike` incorrectly computed (#14792) fix: redirects and i18n routing (#14797) fix: logger level and static paths params (#14799) Fix image tests crashing (#14803) fix(environment): Error overlay not working (#14816) fix: hashing of chunks (#14811) Fix before-hydration script emission for environment-api (#14818) fix: node leak into content collections (#14820) fix: avoid `node:path` (#14827) Fix API route tests (#14825) Fix unit tests (#14832) fix: server islands build (#14830) Fix astro-component-bundling tests (#14840) Fix astro-component-bundling tests (#14837) Fix config alias by using resolve.alias config (#14828) fix: container and routing tests (#14852) fix: respect user vite config on sourcemaps (#14847) fix: remove useless tests (#14854) Fixes assetQueryParams and public folder tests (#14853) fix: renderError fallback (#14855) Fix server-islands data being used across tests (#14857) fix: incorrect configuration in tests (#14858) Fixes for tests in environment branch (#14865) Fixes for e2e tests in environment branch (#14870) fix(test): svelte async rendering (#14886) fix(cloudflare/vercel/netlify): some tests pass and excluded others (#14892) Fixes for node integrations tests (#14900) Fix @astrojs/db tests (#14899) fix(environment): Prevent Vite from interpreting injected sourcemap comments as actual sourcemaps (#14921) Fix remaining cloudflare tests (#14912) fix(vite): import mergeConfig from direct file to avoid dynamic import being processed by Vite (#14939) Fix astro:env tests in Cloudflare (#14925)

matthewp added 7 commits November 21, 2025 14:56

Fixes CSS import order and cloudflare

eed2530

fix build

91138fc

linting obo

f6e4463

Remove the unused ssr-manifest module

4578d2d

fix config-vite tests

9c3aa38

fix content-collections.test.js

5fd8edf

fix entry-file-names.test.js

4509536

github-actions bot added the pkg: astro Related to the core `astro` package (scope) label Nov 21, 2025

matthewp added 12 commits November 22, 2025 08:26

Fix redirects-i18n test

11ab96e

Fix server islands tests

15fc25e

If the module with the server island mapping is in a chunk, need to use a parent-relative import statement to reach the server island module itself.

Prevent CSS from being duplicated between SSR and prerender

8897c3e

Prevent ?raw CSS imports from being added as styles in dev

de91192

Fixes vitest.test.js

d5b6a76

Properly handle isDev in the virtual module

When prerendering, properly handle trailing slash with base

7794452

Prevent empty CSS chunks from being written to disk

59cd518

Update core-image-unconventional-settings tests to use environments API

ce5ed6b

Prevent adding CSS to pages not belonged to

ad982c6

Update astro-global.test.js

732cfaf

Prod now matches dev, we default to adding a trailing slash to the Astro.request.url. Improves an annoying dev/build different in Astro 5.

Prepend base to propagated styles

1bedc36

Propagated styles get embedded in the JS and rendered at runtime if they are used on a page. These need to include the base, which this change makes happen.

fix the build

f2989dd

matthewp marked this pull request as ready for review November 22, 2025 22:07

Princesseuh approved these changes Nov 23, 2025

View reviewed changes

matthewp added 3 commits November 23, 2025 08:07

increase the test timeout

c370419

Use the href for saving unix-style paths for image metadata

6beed57

use fileURLToNormalizedPath

fdf0670

matthewp mentioned this pull request Nov 23, 2025

Fixes for e2e tests in environment branch #14870

Merged

ematipico reviewed Nov 24, 2025

View reviewed changes

matthewp added 2 commits November 24, 2025 08:38

PR comments

eeb4ea9

fix build

d7b534c

add comment on what mergeInlineCss does

b7eeccb

ematipico approved these changes Nov 24, 2025

View reviewed changes

matthewp merged commit 86ad8e1 into feat/environment-api Nov 24, 2025
14 of 21 checks passed

matthewp deleted the tests/various-fixes-2 branch November 24, 2025 14:31

		const isRelativeChunk = !chunk.isEntry;
		const dots = isRelativeChunk ? '..' : '.';

Uh oh!

Fixes for tests in environment branch #14865

Fixes for tests in environment branch #14865

Conversation

matthewp commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Testing

Docs

Uh oh!

changeset-bot bot commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

Princesseuh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

matthewp commented Nov 21, 2025 •

edited

Loading

changeset-bot bot commented Nov 21, 2025 •

edited

Loading