diff --git a/.changeset/chatty-dolls-visit.md b/.changeset/chatty-dolls-visit.md
new file mode 100644
index 000000000..6b9e53e88
--- /dev/null
+++ b/.changeset/chatty-dolls-visit.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/sitemap': minor
+---
+
+Adds support to SSR routes to sitemap generation.
diff --git a/.changeset/friendly-fishes-sing.md b/.changeset/friendly-fishes-sing.md
new file mode 100644
index 000000000..9da10e6bf
--- /dev/null
+++ b/.changeset/friendly-fishes-sing.md
@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+Implement Inline Stylesheets RFC as experimental
diff --git a/.changeset/green-cups-hammer.md b/.changeset/green-cups-hammer.md
new file mode 100644
index 000000000..1492f8d3c
--- /dev/null
+++ b/.changeset/green-cups-hammer.md
@@ -0,0 +1,21 @@
+---
+'astro': minor
+---
+
+Implements a new class-based scoping strategy
+
+This implements the [Scoping RFC](https://github.com/withastro/roadmap/pull/543), providing a way to opt in to increased style specificity for Astro component styles.
+
+This prevents bugs where global styles override Astro component styles due to CSS ordering and the use of element selectors.
+
+To enable class-based scoping, you can set it in your config:
+
+```js
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+ scopedStyleStrategy: 'class'
+});
+```
+
+Note that the 0-specificity `:where` pseudo-selector is still the default strategy. The intent is to change `'class'` to be the default in 3.0.
diff --git a/.changeset/nine-geckos-act.md b/.changeset/nine-geckos-act.md
new file mode 100644
index 000000000..164dbbfd5
--- /dev/null
+++ b/.changeset/nine-geckos-act.md
@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+Support `` to output inline code HTML (no `pre` tag)
diff --git a/.changeset/polite-pears-kneel.md b/.changeset/polite-pears-kneel.md
deleted file mode 100644
index 2469620ec..000000000
--- a/.changeset/polite-pears-kneel.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@astrojs/telemetry': patch
-'@astrojs/webapi': patch
----
-
-Upgrade undici to v5.22.0
diff --git a/.changeset/pretty-bears-deliver.md b/.changeset/pretty-bears-deliver.md
new file mode 100644
index 000000000..2b8bfc818
--- /dev/null
+++ b/.changeset/pretty-bears-deliver.md
@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+New middleware API
diff --git a/.changeset/smooth-cows-jog.md b/.changeset/smooth-cows-jog.md
new file mode 100644
index 000000000..8c6d4563c
--- /dev/null
+++ b/.changeset/smooth-cows-jog.md
@@ -0,0 +1,8 @@
+---
+'@astrojs/markdoc': patch
+'@astrojs/mdx': patch
+'@astrojs/markdown-remark': minor
+'astro': minor
+---
+
+Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `
`. diff --git a/.changeset/tall-news-hang.md b/.changeset/tall-news-hang.md deleted file mode 100644 index 0887bbec1..000000000 --- a/.changeset/tall-news-hang.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Update `experimental.assets`'s `image.service` configuration to allow for a config option in addition to an entrypoint diff --git a/.changeset/tidy-singers-thank.md b/.changeset/tidy-singers-thank.md deleted file mode 100644 index 415679383..000000000 --- a/.changeset/tidy-singers-thank.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@astrojs/cloudflare": patch ---- - -Fix missing code language in Cloudflare README diff --git a/.changeset/twelve-feet-switch.md b/.changeset/twelve-feet-switch.md new file mode 100644 index 000000000..b581fb4c3 --- /dev/null +++ b/.changeset/twelve-feet-switch.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Ensure multiple cookies set in dev result in multiple set-cookie headers diff --git a/.changeset/wise-steaks-wash.md b/.changeset/wise-steaks-wash.md deleted file mode 100644 index 598059ca0..000000000 --- a/.changeset/wise-steaks-wash.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@astrojs/tailwind': patch -'@astrojs/svelte': patch ---- - -Update dependencies diff --git a/.github/workflows/check-merge.yml b/.github/workflows/check-merge.yml index 14d1900e3..e31c09bf4 100644 --- a/.github/workflows/check-merge.yml +++ b/.github/workflows/check-merge.yml @@ -34,7 +34,7 @@ jobs: - name: Get changed files in the .changeset folder id: changed-files - uses: tj-actions/changed-files@v29 + uses: tj-actions/changed-files@v35 if: steps.set-blocks.outputs.blocks == '' with: files: | @@ -87,5 +87,5 @@ jobs: --url https://api.github.com/repos/${{github.repository}}/pulls/${{github.event.number}}/reviews \ --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \ --header 'content-type: application/json' \ - -d '{"event":"REQUEST_CHANGES"}' + -d '{"event":"REQUEST_CHANGES", body: ""}' diff --git a/examples/framework-lit/src/pages/index.astro b/examples/framework-lit/src/pages/index.astro index 1c7b45ce8..a351b8248 100644 --- a/examples/framework-lit/src/pages/index.astro +++ b/examples/framework-lit/src/pages/index.astro @@ -21,12 +21,15 @@ import { MyCounter } from '../components/my-counter.js';{ - /** - * Our VS Code extension does not currently properly typecheck attributes on Lit components - * As such, the following code will result in a TypeScript error inside the editor, nonetheless, it works in Astro! - */ + ( + /** + * Our editor tooling does not currently properly typecheck attributes on imported Lit components. As such, without a + * pragma directive telling TypeScript to ignore the error, the line below will result in an error in the editor. + * Nonetheless, this code works in Astro itself! + */ + // @ts-expect-error + + ) } - {/** @ts-expect-error */} -