Merge branch 'main' into remark-refactor

withastro · Sep 7, 2023 · 4a7931b · 4a7931b
2 parents dda72e3 + 0fa4832
commit 4a7931b
Show file tree

Hide file tree

Showing 109 changed files with 616 additions and 333 deletions.
diff --git a/.changeset/chatty-walls-happen.md b/.changeset/chatty-walls-happen.md
diff --git a/.changeset/empty-rings-bow.md b/.changeset/empty-rings-bow.md
diff --git a/.changeset/fair-countries-admire.md b/.changeset/fair-countries-admire.md
diff --git a/.changeset/giant-cycles-marry.md 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
diff --git a/.changeset/modern-guests-float.md b/.changeset/modern-guests-float.md
diff --git a/.changeset/spotty-glasses-grin.md b/.changeset/spotty-glasses-grin.md
diff --git a/.changeset/strong-colts-hang.md 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
diff --git a/.changeset/weak-kids-roll.md b/.changeset/weak-kids-roll.md
diff --git 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
@@ -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
diff --git a/README.md b/README.md
@@ -83,15 +83,15 @@ 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)
 
 <p align="center">
   <a target="_blank" href="https://github.com/sponsors/withastro">
 
 [![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
@@ -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
@@ -1,16 +1,16 @@
---- 
+---
 interface Props {
 	title: string;
 }
 
 const { title } = Astro.props;
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<meta charset="UTF-8" />
-		<meta name="description" content="Astro description">
+		<meta name="description" content="Astro description" />
 		<meta name="viewport" content="width=device-width" />
 		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<meta name="generator" content={Astro.generator} />
@@ -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;
 	}
 </style>
diff --git 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
@@ -11,7 +11,7 @@ const posts = (await getCollection('blog')).sort(
 );
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />

diff --git 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';
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
@@ -16,14 +16,14 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
 			<h1>🧑‍🚀 Hello, Astronaut!</h1>
 			<p>
 				Welcome to the official <a href="https://astro.build/">Astro</a> 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.
 			</p>
 			<p>
 				This template comes with a few integrations already configured in your
 				<code>astro.config.mjs</code> file. You can customize your setup with
-				<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like Tailwind,
-				React, or Vue to your project.
+				<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like
+				Tailwind, React, or Vue to your project.
 			</p>
 			<p>Here are a few ideas on how to get started with the template:</p>
 			<ul>

diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.0.8"
+    "astro": "^3.0.10"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

diff --git a/examples/deno/package.json b/examples/deno/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.8"
+    "astro": "^3.0.10"
   },
   "devDependencies": {
     "@astrojs/deno": "^5.0.0"

diff --git a/examples/deno/src/components/Layout.astro b/examples/deno/src/components/Layout.astro
@@ -6,7 +6,7 @@ interface Props {
 const { title } = Astro.props as Props;
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<meta charset="UTF-8" />
@@ -46,8 +46,15 @@ const { title } = Astro.props as Props;
 			}
 
 			:global(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;
 			}
 		</style>
 	</body>

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.0",
     "@types/alpinejs": "^3.7.2",
     "alpinejs": "^3.12.3",
-    "astro": "^3.0.8"
+    "astro": "^3.0.10"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.0.8",
+    "astro": "^3.0.10",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-lit/src/pages/index.astro b/examples/framework-lit/src/pages/index.astro
@@ -7,7 +7,7 @@ import { MyCounter } from '../components/my-counter.js';
 // https://docs.astro.build/core-concepts/astro-components/
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -12,11 +12,11 @@
   },
   "dependencies": {
     "@astrojs/preact": "^3.0.0",
-    "@astrojs/react": "^3.0.0",
+    "@astrojs/react": "^3.0.1",
     "@astrojs/solid-js": "^3.0.0",
-    "@astrojs/svelte": "^4.0.0",
+    "@astrojs/svelte": "^4.0.1",
     "@astrojs/vue": "^3.0.0",
-    "astro": "^3.0.8",
+    "astro": "^3.0.10",
     "preact": "^10.17.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.0",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.0.8",
+    "astro": "^3.0.10",
     "preact": "^10.17.1"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^3.0.0",
+    "@astrojs/react": "^3.0.1",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "astro": "^3.0.8",
+    "astro": "^3.0.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.0",
-    "astro": "^3.0.8",
+    "astro": "^3.0.10",
     "solid-js": "^1.7.11"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^4.0.0",
-    "astro": "^3.0.8",
+    "@astrojs/svelte": "^4.0.1",
+    "astro": "^3.0.10",
     "svelte": "^4.2.0"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^3.0.0",
-    "astro": "^3.0.8",
+    "astro": "^3.0.10",
     "vue": "^3.3.4"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.0",
-    "astro": "^3.0.8"
+    "astro": "^3.0.10"
   }
 }
diff --git a/examples/hackernews/src/pages/stories/[id].astro b/examples/hackernews/src/pages/stories/[id].astro
@@ -25,7 +25,7 @@ const story = (await fetchAPI(`item/${id}`)) as IStory;
 				<a href={`/users/${story.user}`}>
 					{story.user}
 				</a>
-				&nbsp;{story.time_ago}
+				 &nbsp;{story.time_ago}
 			</p>
 		</header>
 		<main>

diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.0.8"
+    "astro": "^3.0.10"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"