Skip to content

chore: merge main into next#16434

Merged
ematipico merged 132 commits into
nextfrom
chore/merge-main-next
Apr 21, 2026
Merged

chore: merge main into next#16434
ematipico merged 132 commits into
nextfrom
chore/merge-main-next

Conversation

@ematipico
Copy link
Copy Markdown
Member

@ematipico ematipico commented Apr 21, 2026

Changes

Before merging #15819

Wanna first rebase onto the latest code

Testing

Green CI

Docs

matthewp and others added 30 commits March 30, 2026 16:34
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…pdate (#16124)

* fix(content): clear stale asset imports on content collection entry update

* fix lint errors
…#16110)

* fix(core): append assetQueryParams to inter-chunk JS imports (#15964)

* Add changeset for inter-chunk skew protection fix
* fix(vercel): edge middleware next() drops HTTP method and body

* fix: conditional and format-sensitive
* Update dev head metadata for non-runnable pipeline

* Refine non-runnable component metadata loading

* Load component metadata in non-runnable dev

* Remove unused export for virtual component metadata constant

* Add docs for virtual component metadata module
…to 'node' (#16162)

Co-authored-by: Matthew Phillips <matthewphillips@cloudflare.com>
…nts (#16142)

* fix(container): don't escape slot HTML in renderToString during build

* performance issue

* oops

* apply Erika's suggestion

* use `isHTMLString` within `markHTMLString`

* simplify test fixtures

* format

* remove the no longer used `Symbol.toStringTag` from `HTMLString`

* rename to `htmlStringSymbol`

* update changeset

* Apply suggestion from @ematipico

---------

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>
…16034)

Co-authored-by: astrobot-houston <fred+astrobot@astro.build>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…16154)

* Fix periods in URLs with trailing slashes causing 404s in dev server (#16140)

Pages with dots in their filenames (e.g. `hello.world.astro`) were incorrectly
treated as file-extension paths, forcing `trailingSlash: 'never'` regardless of
user config. Only endpoints with file extensions should force this behavior.

* ci: retry flaky e2e tests

* ci: retry flaky e2e tests

---------

Co-authored-by: Matthew Phillips <matthewphillips@cloudflare.com>
)

* docs(language-tools): mention js/ts settings namespace in vscode

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Matthew Phillips <matthew@matthewphillips.info>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…6183)

A spurious import of createLoggerFromFlags from cli/flags.ts was added
to the client-side PostComment.tsx component via a sync commit, breaking
hydration and causing Comment and Logout tests to fail.
…rts (#16059)

* fix: preserve viteServer.restart wrapper chain for Cloudflare adapter

* add changeset

* fix: use Vite in-place restart for config changes to preserve Cloudflare miniflare instance

* use vite.resolveConfig to get a proper ResolvedConfig instead of patching inlineConfig

* fix watcher listener accumulation, null-check hot.send, move restartInFlight to finally, add tests

* fix port drift on restart by passing current httpServer port to createVite

* remove non-actionable CSP dev warning

* merge main, fix restart tests to use static fixture dir
* fix(astro): remove unused re-exports causing Vite build warning (#16188)

* chore: add changeset

---------

Co-authored-by: astrobot-houston <fred+astrobot@astro.build>
…seAge (#16211)

* Exclude astro-og-canvas@0.11.0 from minimumReleaseAge

* Exclude @types/node@24.12.2 from minimumReleaseAge
@changeset-bot
Copy link
Copy Markdown

changeset-bot Bot commented Apr 21, 2026

🦋 Changeset detected

Latest commit: 41d8a8c

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

@github-actions github-actions Bot added feat: markdown Related to Markdown (scope) pkg: svelte Related to Svelte (scope) pkg: vue Related to Vue (scope) pkg: example Related to an example package (scope) 🚨 action Modifies GitHub Actions pkg: react Related to React (scope) pkg: preact Related to Preact (scope) pkg: integration Related to any renderer integration (scope) pkg: create-astro Related to the `create-astro` package (scope) pkg: astro Related to the core `astro` package (scope) docs pr labels Apr 21, 2026
@github-actions
Copy link
Copy Markdown
Contributor

📊 Dependency Size Changes

Warning

This PR adds 913.3 kB of new dependencies, which exceeds the threshold of 100 kB.

📦 Package 📏 Size
@biomejs/cli-linux-x64@2.4.2 → @biomejs/cli-linux-x64@2.4.10 2.9 MB
@types/node@18.19.130 -2.1 MB
undici-types@5.26.5 -73.1 kB
@types/express-serve-static-core@5.1.1 45.2 kB
prettier@3.8.1 → prettier@3.8.2 23.9 kB
@biomejs/biome@2.4.2 → @biomejs/biome@2.4.10 16.5 kB
@types/serve-static@2.2.0 8.7 kB
@types/body-parser@1.19.6 7.9 kB
@types/express@5.0.6 7.6 kB
@types/qs@6.15.0 7.6 kB
@types/http-errors@2.0.5 6.8 kB
svelte@5.54.1 → svelte@5.55.3 6.3 kB
@types/connect@3.4.38 5.9 kB
@types/range-parser@1.2.7 4.6 kB
@qwik.dev/partytown@0.11.2 → @qwik.dev/partytown@0.13.2 2.5 kB
tinyglobby@0.2.15 → tinyglobby@0.2.16 -1.5 kB
ovsx@0.10.9 → ovsx@0.10.10 20 B
transitivePeerDependencie@transitivePeerDependencies Unknown

Total size change: 913.3 kB

@ematipico
Copy link
Copy Markdown
Member Author

Smoke test is expected to fail because we haven't updated that part

@ematipico ematipico merged commit ee079d4 into next Apr 21, 2026
24 of 26 checks passed
@ematipico ematipico deleted the chore/merge-main-next branch April 21, 2026 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🚨 action Modifies GitHub Actions docs pr feat: markdown Related to Markdown (scope) pkg: astro Related to the core `astro` package (scope) pkg: create-astro Related to the `create-astro` package (scope) pkg: example Related to an example package (scope) pkg: integration Related to any renderer integration (scope) pkg: preact Related to Preact (scope) pkg: react Related to React (scope) pkg: svelte Related to Svelte (scope) pkg: vue Related to Vue (scope)

Projects

None yet

Development

Successfully merging this pull request may close these issues.