Skip to content

[pull] main from withastro:main#625

Merged
pull[bot] merged 13 commits into
code:mainfrom
withastro:main
Jul 1, 2026
Merged

[pull] main from withastro:main#625
pull[bot] merged 13 commits into
code:mainfrom
withastro:main

Conversation

@pull

@pull pull Bot commented Jul 1, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

astrobot-houston and others added 13 commits July 1, 2026 11:46
…ng edge function emulation (#17245)

* fix(netlify): expose edgeFunctions in devFeatures to allow disabling edge function emulation (#17244)

* Apply suggestion from @matthewp

---------

Co-authored-by: Matthew Phillips <matthewphillips@cloudflare.com>
…operty highlighting (#17254)

All 7 style injection patterns in the Astro TextMate grammar used end: '(?=</)'
to detect </style>, but this end pattern could be blocked when the embedded CSS
grammar had an active child pattern that hadn't terminated. CSS @Property's
syntax: "<color>" descriptor triggers VS Code's CSS grammar to start a selector
pattern, and the > in <color> gets consumed as a CSS child combinator. The
selector never closes, so </style> is never detected.

Script injection patterns were already fixed for this same class of issue in
PR #15109 using a two-pattern approach (begin/end for single-line + begin/while
for multi-line). The while pattern is evaluated at the start of each line before
child patterns, making it immune to embedded grammar stuck states. This commit
applies the same fix to all 7 style injection patterns.

Also updates the dummy CSS grammar to include a minimal selector pattern that
simulates VS Code's real CSS grammar behavior, so the bug is properly caught
by snapshot tests.

Fixes #16751
…compile` + `custom`) (#17099)

* fix(cloudflare): respect custom `image.service` in compile mode

* Update .changeset/cloudflare-compile-respect-image-service.md

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

* fix(cloudflare): also generate build-time images for `imageService: 'custom'`

* Update .changeset/cloudflare-compile-respect-image-service.md

Co-authored-by: Armand Philippot <git@armand.philippot.eu>

* test(cloudflare): skip real-Sharp build-time image tests on Windows CI

The default-Sharp and Sharp-backed build-time image tests invoke Astro's
real Sharp native binary, which fails to load on the Windows CI runner
(ERR_DLOPEN_FAILED). Skip those two on win32 while keeping full real-WEBP
coverage on Linux/macOS. The Sharp-free user service runs everywhere.

---------

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>
Co-authored-by: Armand Philippot <git@armand.philippot.eu>
Co-authored-by: Matthew Phillips <matthewphillips@cloudflare.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…es (#13684)\n\nRe-exec with --use-env-proxy when proxy env vars are detected, so native\nfetch() used by @bluwy/giget-core routes template downloads through the\nconfigured proxy. Degrades gracefully on Node.js < 22.21.0. (#17259)
…#17248)

* fix(server): skip dev server plugin setup in Vitest to prevent wrapDynamicImport crash (#16275)

* Apply suggestion from @matthewp

---------

Co-authored-by: Matthew Phillips <matthewphillips@cloudflare.com>
…rtual store (#17257)

* fix: resolve getPackage imports from project directory instead of astro install location (#17135)

* fix: provide type argument to getPackage in test to fix build

---------

Co-authored-by: Matthew Phillips <matthew@matthewphillips.info>
@pull pull Bot locked and limited conversation to collaborators Jul 1, 2026
@pull pull Bot added the ⤵️ pull label Jul 1, 2026
@pull pull Bot merged commit 79aa99c into code:main Jul 1, 2026
10 of 11 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants