diff --git a/.changeset/chatty-walls-happen.md b/.changeset/chatty-walls-happen.md deleted file mode 100644 index 58fe5e6edb2c..000000000000 --- a/.changeset/chatty-walls-happen.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixed a case where dynamic imports tried to preload inlined stylesheets. diff --git a/.changeset/empty-rings-bow.md b/.changeset/empty-rings-bow.md deleted file mode 100644 index fd928d548c04..000000000000 --- a/.changeset/empty-rings-bow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fixes remote assets caching logic to not use expired assets diff --git a/.changeset/fair-countries-admire.md b/.changeset/fair-countries-admire.md deleted file mode 100644 index 1868ab016695..000000000000 --- a/.changeset/fair-countries-admire.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/svelte': patch ---- - -Removed vite warnings. diff --git a/.changeset/giant-cycles-marry.md b/.changeset/giant-cycles-marry.md new file mode 100644 index 000000000000..284f8531b5bc --- /dev/null +++ b/.changeset/giant-cycles-marry.md @@ -0,0 +1,5 @@ +--- +'@astrojs/solid-js': patch +--- + +Fix hydration in Solid renderer diff --git a/.changeset/hip-cats-jump.md b/.changeset/hip-cats-jump.md deleted file mode 100644 index f728408a082a..000000000000 --- a/.changeset/hip-cats-jump.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix missing type for `imageConfig` export from `astro:assets` diff --git a/.changeset/modern-guests-float.md b/.changeset/modern-guests-float.md deleted file mode 100644 index cda74642aac0..000000000000 --- a/.changeset/modern-guests-float.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/vercel': patch ---- - -Fix serverless function naming conflicts for routes with identical filenames but different directory structures diff --git a/.changeset/spotty-glasses-grin.md b/.changeset/spotty-glasses-grin.md deleted file mode 100644 index 3a903b79dd32..000000000000 --- a/.changeset/spotty-glasses-grin.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/mdx': patch ---- - -Add location data to MDX compile errors diff --git a/.changeset/strong-colts-hang.md b/.changeset/strong-colts-hang.md new file mode 100644 index 000000000000..90b822b41d42 --- /dev/null +++ b/.changeset/strong-colts-hang.md @@ -0,0 +1,5 @@ +--- +"astro": patch +--- + +Fix "Cannot read properties of null" error in CLI code diff --git a/.changeset/twelve-cars-tell.md b/.changeset/twelve-cars-tell.md deleted file mode 100644 index a1812d637aff..000000000000 --- a/.changeset/twelve-cars-tell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix markdown page HMR diff --git a/.changeset/weak-kids-roll.md b/.changeset/weak-kids-roll.md deleted file mode 100644 index 7d6d61f42e1f..000000000000 --- a/.changeset/weak-kids-roll.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix scroll position when navigating back from page w/o ViewTransitions diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01c573e10382..cab1fd79f2a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,7 @@ jobs: strategy: matrix: OS: [ubuntu-latest] - NODE_VERSION: [18, 20] + NODE_VERSION: [18, 20.5.1] include: - os: macos-latest NODE_VERSION: 18 diff --git a/.prettierignore b/.prettierignore index f53f92086ca7..af84e34338c1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,10 +1,3 @@ -# Ignoring these files for now due to https://github.com/withastro/compiler/issues/585 -examples/basics/src/layouts -examples/with-nanostores/src/layouts - -# Ignoring this file for now due to https://github.com/withastro/compiler/issues/485 -packages/markdown/component/Markdown.astro - # Benchmark artifacts benchmark/projects/ benchmark/results/ diff --git a/.prettierrc.cjs b/.prettierrc.cjs deleted file mode 100644 index 39911db2c101..000000000000 --- a/.prettierrc.cjs +++ /dev/null @@ -1,24 +0,0 @@ -// Heads up: This file should be renamed to `.cjs`, however if we did that, changesets wouldn't be able to load it -module.exports = { - printWidth: 100, - semi: true, - singleQuote: true, - tabWidth: 2, - trailingComma: 'es5', - useTabs: true, - plugins: ['prettier-plugin-astro'], - overrides: [ - { - files: ['.*', '*.json', '*.md', '*.toml', '*.yml'], - options: { - useTabs: false, - }, - }, - { - files: ['**/*.astro'], - options: { - parser: 'astro', - }, - }, - ], -}; diff --git a/README.md b/README.md index 3a28ad530281..c49b4760e085 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Several official projects are maintained outside of this repo: ## Sponsors -Astro is generously supported by Netlify, Storyblok, and several other amazing organizations. +Astro is free, open source software made possible by these wonderful sponsors. [❤️ Sponsor Astro! ❤️](https://github.com/withastro/.github/blob/main/FUNDING.md) @@ -91,7 +91,7 @@ Astro is generously supported by Netlify, Storyblok, and several other amazing o [![Astro's sponsors.](https://astro.build/sponsors.png "Astro's sponsors. -Platinum sponsors: Netlify, storyblok, Vercel, Ship Shape, Google Chrome +Platinum sponsors: Vercel, storyblok, Netlify, Ship Shape, Google Chrome Gold sponsors: ‹div›RIOTS, DEEPGRAM, Transloadit, CloudCannon Sponsors: Monogram, Qoddi, Dimension")](https://github.com/sponsors/withastro) diff --git a/examples/basics/package.json b/examples/basics/package.json index 8bca8d9270ec..f732916c21a5 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.8" + "astro": "^3.0.10" } } diff --git a/examples/basics/src/layouts/Layout.astro b/examples/basics/src/layouts/Layout.astro index 3345b887ce7f..7b552be19bca 100644 --- a/examples/basics/src/layouts/Layout.astro +++ b/examples/basics/src/layouts/Layout.astro @@ -1,4 +1,4 @@ ---- +--- interface Props { title: string; } @@ -6,11 +6,11 @@ interface Props { const { title } = Astro.props; --- - + - + @@ -25,15 +25,27 @@ const { title } = Astro.props; --accent: 136, 58, 234; --accent-light: 224, 204, 250; --accent-dark: 49, 10, 101; - --accent-gradient: linear-gradient(45deg, rgb(var(--accent)), rgb(var(--accent-light)) 30%, white 60%); + --accent-gradient: linear-gradient( + 45deg, + rgb(var(--accent)), + rgb(var(--accent-light)) 30%, + white 60% + ); } html { font-family: system-ui, sans-serif; - background: #13151A; + background: #13151a; background-size: 224px; } code { - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, - Bitstream Vera Sans Mono, Courier New, monospace; + font-family: + Menlo, + Monaco, + Lucida Console, + Liberation Mono, + DejaVu Sans Mono, + Bitstream Vera Sans Mono, + Courier New, + monospace; } diff --git a/examples/blog/package.json b/examples/blog/package.json index 347540e050a9..e76a9055ac0d 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^1.0.0", + "@astrojs/mdx": "^1.0.2", "@astrojs/rss": "^3.0.0", "@astrojs/sitemap": "^3.0.0", - "astro": "^3.0.8" + "astro": "^3.0.10" } } diff --git a/examples/blog/src/pages/blog/index.astro b/examples/blog/src/pages/blog/index.astro index a5c329a87f06..ebbcd304272f 100644 --- a/examples/blog/src/pages/blog/index.astro +++ b/examples/blog/src/pages/blog/index.astro @@ -11,7 +11,7 @@ const posts = (await getCollection('blog')).sort( ); --- - + diff --git a/examples/blog/src/pages/index.astro b/examples/blog/src/pages/index.astro index 26f070da5e80..1c8be6135dfb 100644 --- a/examples/blog/src/pages/index.astro +++ b/examples/blog/src/pages/index.astro @@ -5,7 +5,7 @@ import Footer from '../components/Footer.astro'; import { SITE_TITLE, SITE_DESCRIPTION } from '../consts'; --- - + @@ -16,14 +16,14 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';

🧑‍🚀 Hello, Astronaut!

Welcome to the official Astro blog starter template. This - template serves as a lightweight, minimally-styled starting point for anyone looking to build - a personal website, blog, or portfolio with Astro. + template serves as a lightweight, minimally-styled starting point for anyone looking to + build a personal website, blog, or portfolio with Astro.

This template comes with a few integrations already configured in your astro.config.mjs file. You can customize your setup with - Astro Integrations to add tools like Tailwind, - React, or Vue to your project. + Astro Integrations to add tools like + Tailwind, React, or Vue to your project.

Here are a few ideas on how to get started with the template: