diff --git a/.changeset/chatty-dolls-visit.md b/.changeset/chatty-dolls-visit.md
deleted file mode 100644
index 6b9e53e88e723..0000000000000
--- a/.changeset/chatty-dolls-visit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@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
deleted file mode 100644
index 9da10e6bf9c0c..0000000000000
--- a/.changeset/friendly-fishes-sing.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': minor
----
-
-Implement Inline Stylesheets RFC as experimental
diff --git a/.changeset/green-cups-hammer.md b/.changeset/green-cups-hammer.md
deleted file mode 100644
index 1492f8d3c4740..0000000000000
--- a/.changeset/green-cups-hammer.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-'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
deleted file mode 100644
index 164dbbfd56324..0000000000000
--- a/.changeset/nine-geckos-act.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': minor
----
-
-Support ``.
diff --git a/.changeset/twelve-feet-switch.md b/.changeset/twelve-feet-switch.md
deleted file mode 100644
index b581fb4c33901..0000000000000
--- a/.changeset/twelve-feet-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Ensure multiple cookies set in dev result in multiple set-cookie headers
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 0ce75e341deb0..ac6cf2fb7e060 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,42 @@
# astro
+## 2.4.0
+
+### Minor Changes
+
+- [#6659](https://github.com/withastro/astro/pull/6659) [`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511) Thanks [@lilnasy](https://github.com/lilnasy)! - Implement Inline Stylesheets RFC as experimental
+
+- [#6771](https://github.com/withastro/astro/pull/6771) [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31) Thanks [@matthewp](https://github.com/matthewp)! - 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.
+
+- [#6959](https://github.com/withastro/astro/pull/6959) [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885) Thanks [@bluwy](https://github.com/bluwy)! - Support ``.
+
+### Patch Changes
+
+- [#6973](https://github.com/withastro/astro/pull/6973) [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d) Thanks [@matthewp](https://github.com/matthewp)! - Ensure multiple cookies set in dev result in multiple set-cookie headers
+
+- Updated dependencies [[`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7)]:
+ - @astrojs/markdown-remark@2.2.0
+
## 2.3.4
### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 08ee274a68fbf..4502c982aa10d 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
{
"name": "astro",
- "version": "2.3.4",
+ "version": "2.4.0",
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
"type": "module",
"author": "withastro",
@@ -112,7 +112,7 @@
"dependencies": {
"@astrojs/compiler": "^1.4.0",
"@astrojs/language-server": "^1.0.0",
- "@astrojs/markdown-remark": "^2.1.4",
+ "@astrojs/markdown-remark": "^2.2.0",
"@astrojs/telemetry": "^2.1.1",
"@astrojs/webapi": "^2.1.1",
"@babel/core": "^7.18.2",
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index f458938210025..cb66fc2ce3293 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1055,7 +1055,7 @@ export interface AstroUserConfig {
* }
*/
inlineStylesheets?: 'always' | 'auto' | 'never';
-
+
/**
* @docs
* @name experimental.middleware
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index d00cef26885e4..f8abe2b459849 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -47,12 +47,7 @@ import { createRequest } from '../request.js';
import { matchRoute } from '../routing/match.js';
import { getOutputFilename } from '../util.js';
import { getOutDirWithinCwd, getOutFile, getOutFolder } from './common.js';
-import {
- eachPageData,
- getPageDataByComponent,
- cssOrder,
- mergeInlineCss,
-} from './internal.js';
+import { eachPageData, getPageDataByComponent, cssOrder, mergeInlineCss } from './internal.js';
import type {
PageBuildData,
SingleFileBuiltModule,
diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts
index eff3f5becff3e..1d69849c90c82 100644
--- a/packages/astro/src/core/build/internal.ts
+++ b/packages/astro/src/core/build/internal.ts
@@ -272,7 +272,7 @@ export function mergeInlineCss(
acc[acc.length - 1] = merged;
return acc;
}
- acc.push(current)
+ acc.push(current);
return acc;
}
diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts
index c6a48c0914ac6..a5bdb70f112b9 100644
--- a/packages/astro/src/core/build/plugins/plugin-css.ts
+++ b/packages/astro/src/core/build/plugins/plugin-css.ts
@@ -58,8 +58,8 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
let resolvedConfig: ResolvedConfig;
// stylesheet filenames are kept in here until "post", when they are rendered and ready to be inlined
- const pagesToCss: Record> = {}
- const pagesToPropagatedCss: Record>> = {}
+ const pagesToCss: Record> = {};
+ const pagesToPropagatedCss: Record>> = {};
const cssBuildPlugin: VitePlugin = {
name: 'astro:rollup-plugin-build-css',
@@ -129,7 +129,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
for (const id of Object.keys(chunk.modules)) {
for (const pageData of getParentClientOnlys(id, this, internals)) {
for (const importedCssImport of meta.importedCss) {
- const cssToInfoRecord = pagesToCss[pageData.moduleSpecifier] ??= {}
+ const cssToInfoRecord = (pagesToCss[pageData.moduleSpecifier] ??= {});
cssToInfoRecord[importedCssImport] = { depth: -1, order: -1 };
}
}
@@ -155,8 +155,8 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
if (pageData === undefined) continue;
for (const css of meta.importedCss) {
- const propagatedStyles = pagesToPropagatedCss[pageData.moduleSpecifier] ??= {}
- const existingCss = propagatedStyles[pageInfo.id] ??= new Set();
+ const propagatedStyles = (pagesToPropagatedCss[pageData.moduleSpecifier] ??= {});
+ const existingCss = (propagatedStyles[pageInfo.id] ??= new Set());
existingCss.add(css);
}
@@ -194,7 +194,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
);
if (cssChunk === undefined) return;
for (const pageData of eachPageData(internals)) {
- const cssToInfoMap = pagesToCss[pageData.moduleSpecifier] ??= {};
+ const cssToInfoMap = (pagesToCss[pageData.moduleSpecifier] ??= {});
cssToInfoMap[cssChunk.fileName] = { depth: -1, order: -1 };
}
},
@@ -312,7 +312,7 @@ function appendCSSToPage(
cssInfo.order = order;
}
} else {
- const cssToInfoRecord = pagesToCss[pageData.moduleSpecifier] ??= {};
+ const cssToInfoRecord = (pagesToCss[pageData.moduleSpecifier] ??= {});
cssToInfoRecord[importedCssImport] = { depth, order };
}
}
diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts
index 9b0a7e8482057..bd067a6678715 100644
--- a/packages/astro/src/core/build/plugins/plugin-ssr.ts
+++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts
@@ -13,11 +13,7 @@ import { joinPaths, prependForwardSlash } from '../../path.js';
import { serializeRouteData } from '../../routing/index.js';
import { addRollupInput } from '../add-rollup-input.js';
import { getOutFile, getOutFolder } from '../common.js';
-import {
- eachPageData,
- cssOrder,
- mergeInlineCss,
-} from '../internal.js';
+import { eachPageData, cssOrder, mergeInlineCss } from '../internal.js';
import type { AstroBuildPlugin } from '../plugin';
export const virtualModuleId = '@astrojs-ssr-virtual-entry';
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index 7f0dbb514fd79..bfd2e19e51b43 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -38,7 +38,7 @@
"tiny-glob": "^0.2.9"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4"
+ "astro": "workspace:^2.4.0"
},
"devDependencies": {
"astro": "workspace:*",
diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json
index 5933de5e64f2a..f9092a058e66d 100644
--- a/packages/integrations/deno/package.json
+++ b/packages/integrations/deno/package.json
@@ -33,7 +33,7 @@
"esbuild": "^0.15.18"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4"
+ "astro": "workspace:^2.4.0"
},
"devDependencies": {
"astro": "workspace:*",
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index 39ddb34ec9c31..9e0c8b8c74134 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -62,7 +62,7 @@
"vite": "^4.3.1"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4",
+ "astro": "workspace:^2.4.0",
"sharp": ">=0.31.0"
},
"peerDependenciesMeta": {
diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md
index 180ba6cf6e560..3c1b2902b4a66 100644
--- a/packages/integrations/markdoc/CHANGELOG.md
+++ b/packages/integrations/markdoc/CHANGELOG.md
@@ -1,5 +1,14 @@
# @astrojs/markdoc
+## 0.1.2
+
+### Patch Changes
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. ``.
+
+- Updated dependencies [[`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511), [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31), [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885), [`831b67cdb`](https://github.com/withastro/astro/commit/831b67cdb8250f93f66e3b171fab024652bf80f2), [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7), [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d)]:
+ - astro@2.4.0
+
## 0.1.1
### Patch Changes
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index ae535d4c3dd10..9d3677a7f30e8 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/markdoc",
"description": "Add support for Markdoc pages in your Astro site",
- "version": "0.1.1",
+ "version": "0.1.2",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
@@ -41,7 +41,7 @@
"zod": "^3.17.3"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4"
+ "astro": "workspace:^2.4.0"
},
"devDependencies": {
"@types/chai": "^4.3.1",
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index 1640e057905f3..e78ae02a7168c 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -1,5 +1,14 @@
# @astrojs/mdx
+## 0.19.1
+
+### Patch Changes
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. ``.
+
+- Updated dependencies [[`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7)]:
+ - @astrojs/markdown-remark@2.2.0
+
## 0.19.0
### Minor Changes
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index c801d674e6c50..659e8b9a1fbd9 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/mdx",
"description": "Add support for MDX pages in your Astro site",
- "version": "0.19.0",
+ "version": "0.19.1",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
@@ -30,7 +30,7 @@
"test:match": "mocha --timeout 20000 -g"
},
"dependencies": {
- "@astrojs/markdown-remark": "^2.1.4",
+ "@astrojs/markdown-remark": "^2.2.0",
"@astrojs/prism": "^2.1.1",
"@mdx-js/mdx": "^2.3.0",
"@mdx-js/rollup": "^2.3.0",
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index ea8f30f093b10..ff261927436fb 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -39,7 +39,7 @@
"esbuild": "^0.15.18"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4"
+ "astro": "workspace:^2.4.0"
},
"devDependencies": {
"@netlify/edge-functions": "^2.0.0",
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 5c7595190c06d..924e9627f4af0 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -35,7 +35,7 @@
"server-destroy": "^1.0.1"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4"
+ "astro": "workspace:^2.4.0"
},
"devDependencies": {
"@types/send": "^0.17.1",
diff --git a/packages/integrations/sitemap/CHANGELOG.md b/packages/integrations/sitemap/CHANGELOG.md
index a71b373ff7d1f..3165f6dfbf146 100644
--- a/packages/integrations/sitemap/CHANGELOG.md
+++ b/packages/integrations/sitemap/CHANGELOG.md
@@ -1,5 +1,11 @@
# @astrojs/sitemap
+## 1.3.0
+
+### Minor Changes
+
+- [#6534](https://github.com/withastro/astro/pull/6534) [`ad907196c`](https://github.com/withastro/astro/commit/ad907196cb42f21d9540ae0d77aa742bf7adf030) Thanks [@atilafassina](https://github.com/atilafassina)! - Adds support to SSR routes to sitemap generation.
+
## 1.2.2
### Patch Changes
diff --git a/packages/integrations/sitemap/package.json b/packages/integrations/sitemap/package.json
index 7c465494ee399..102102985fc79 100644
--- a/packages/integrations/sitemap/package.json
+++ b/packages/integrations/sitemap/package.json
@@ -1,7 +1,7 @@
{
"name": "@astrojs/sitemap",
"description": "Generate a sitemap for your Astro site",
- "version": "1.2.2",
+ "version": "1.3.0",
"type": "module",
"types": "./dist/index.d.ts",
"author": "withastro",
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 427b9747202e8..2423286f68480 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -43,7 +43,7 @@
"vite": "^4.3.1"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4",
+ "astro": "workspace:^2.4.0",
"svelte": "^3.54.0"
},
"engines": {
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index df770eb171e48..ca057aae6063f 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -40,7 +40,7 @@
"vite": "^4.3.1"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4",
+ "astro": "workspace:^2.4.0",
"tailwindcss": "^3.0.24"
},
"pnpm": {
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index b639cc7caf089..635465ad63980 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -55,7 +55,7 @@
"web-vitals": "^3.1.1"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4"
+ "astro": "workspace:^2.4.0"
},
"devDependencies": {
"@types/set-cookie-parser": "^2.4.2",
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 48760e11ab95d..af94d6f97dbe0 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -50,7 +50,7 @@
"vue": "^3.2.37"
},
"peerDependencies": {
- "astro": "workspace:^2.3.4",
+ "astro": "workspace:^2.4.0",
"vue": "^3.2.30"
},
"engines": {
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index cacfca845b4fc..b306ebc17ee56 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -1,5 +1,16 @@
# @astrojs/markdown-remark
+## 2.2.0
+
+### Minor Changes
+
+- [#6932](https://github.com/withastro/astro/pull/6932) [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. ``.
+
+### Patch Changes
+
+- Updated dependencies [[`80e3d4d3d`](https://github.com/withastro/astro/commit/80e3d4d3d0f7719d8eae5435bba3805503057511), [`3326492b9`](https://github.com/withastro/astro/commit/3326492b94f76ed2b0154dd9b9a1a9eb883c1e31), [`cac4a321e`](https://github.com/withastro/astro/commit/cac4a321e814fb805eb0e3ced469e25261a50885), [`831b67cdb`](https://github.com/withastro/astro/commit/831b67cdb8250f93f66e3b171fab024652bf80f2), [`49514e4ce`](https://github.com/withastro/astro/commit/49514e4ce40fedb39bf7decd2c296258efbdafc7), [`0883fd487`](https://github.com/withastro/astro/commit/0883fd4875548a613df122f0b87a1ca8b7a7cf7d)]:
+ - astro@2.4.0
+
## 2.1.4
### Patch Changes
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index edf4cfba5109c..bf9d4262d2b6a 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -1,6 +1,6 @@
{
"name": "@astrojs/markdown-remark",
- "version": "2.1.4",
+ "version": "2.2.0",
"type": "module",
"author": "withastro",
"license": "MIT",
@@ -25,7 +25,7 @@
"test": "mocha --exit --timeout 20000"
},
"peerDependencies": {
- "astro": "workspace:^2.3.0"
+ "astro": "workspace:^2.4.0"
},
"dependencies": {
"@astrojs/prism": "^2.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 83629c3105e59..3fb21dba0acc2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -559,7 +559,7 @@ importers:
specifier: ^1.0.0
version: 1.0.0
'@astrojs/markdown-remark':
- specifier: ^2.1.4
+ specifier: ^2.2.0
version: link:../markdown/remark
'@astrojs/telemetry':
specifier: ^2.1.1
@@ -3994,7 +3994,7 @@ importers:
packages/integrations/mdx:
dependencies:
'@astrojs/markdown-remark':
- specifier: ^2.1.4
+ specifier: ^2.2.0
version: link:../../markdown/remark
'@astrojs/prism':
specifier: ^2.1.1