Merge branch 'main' into astro-add-adapters

withastro · Sep 6, 2022 · 62b5275 · 62b5275
2 parents 9568500 + 6506e84
commit 62b5275
Show file tree

Hide file tree

Showing 96 changed files with 1,652 additions and 906 deletions.
diff --git a/.changeset/loud-berries-sit.md b/.changeset/loud-berries-sit.md
diff --git a/.changeset/slimy-fireants-carry.md b/.changeset/slimy-fireants-carry.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Correctly escape paths in file names
diff --git a/.changeset/smooth-hats-smell.md b/.changeset/smooth-hats-smell.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Ensure SSR module is loaded before testing if it's CSS in dev
diff --git a/.changeset/three-owls-help.md b/.changeset/three-owls-help.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/alpinejs': patch
+---
+
+Update homepage link
diff --git a/.changeset/weak-emus-confess.md b/.changeset/weak-emus-confess.md
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,2 @@
-* @snowpackjs/maintainers
+README.md @withastro/maintainers-docs
+packages/astro/src/@types/astro.ts @withastro/maintainers-docs
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,6 +12,9 @@
 
 ## Docs
 
-<!-- Is this a visible change? You probably need to update docs! -->
+<!-- Could this affect a user’s behavior? We probably need to update docs! -->
+<!-- If docs will be needed or you’re not sure, uncomment the next line: -->
+<!-- /cc @withastro/maintainers-docs for feedback! -->
+
 <!-- DON'T DELETE THIS SECTION! If no docs added, explain why.-->
-<!-- https://github.com/withastro/docs -->
+<!-- https://github.com/withastro/docs -->
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
-    "@astrojs/mdx": "^0.11.0",
+    "astro": "^1.1.5",
+    "@astrojs/mdx": "^0.11.1",
     "@astrojs/rss": "^1.0.0",
     "@astrojs/sitemap": "^1.0.0"
   }

diff --git a/examples/blog/src/layouts/BlogPost.astro b/examples/blog/src/layouts/BlogPost.astro
@@ -18,7 +18,7 @@ const {
 } = Astro.props;
 ---
 
-<html>
+<html lang="en">
 	<head>
 		<BaseHead title={title} description={description} />
 		<style>

diff --git a/examples/blog/src/pages/blog.astro b/examples/blog/src/pages/blog.astro
@@ -11,7 +11,7 @@ const posts = (await Astro.glob('./blog/*.{md,mdx}')).sort(
 ---
 
 <!DOCTYPE html>
-<html lang="en-us">
+<html lang="en">
 	<head>
 		<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
 		<style>
@@ -51,7 +51,7 @@ const posts = (await Astro.glob('./blog/*.{md,mdx}')).sort(
 					))}
 				</ul>
 			</section>
-			<Footer />
 		</main>
+		<Footer />
 	</body>
 </html>
diff --git a/examples/blog/src/pages/index.astro b/examples/blog/src/pages/index.astro
@@ -6,7 +6,7 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '../config';
 ---
 
 <!DOCTYPE html>
-<html lang="en-us">
+<html lang="en">
 	<head>
 		<BaseHead title={SITE_TITLE} description={SITE_DESCRIPTION} />
 	</head>

diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
@@ -11,6 +11,6 @@
   },
   "devDependencies": {
     "@example/my-component": "workspace:*",
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -8,6 +8,6 @@
     "serve": "astro --root demo preview"
   },
   "dependencies": {
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",

diff --git a/examples/docs/src/components/Header/LanguageSelect.tsx b/examples/docs/src/components/Header/LanguageSelect.tsx
@@ -36,7 +36,7 @@ const LanguageSelect: FunctionComponent<{ lang: string }> = ({ lang }) => {
 			>
 				{Object.entries(KNOWN_LANGUAGES).map(([key, value]) => {
 					return (
-						<option value={value}>
+						<option value={value} key={value}>
 							<span>{key}</span>
 						</option>
 					);

diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "alpinejs": "^3.10.2",
     "@astrojs/alpinejs": "^0.1.1",
     "@types/alpinejs": "^3.7.0"

diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "lit": "^2.2.5",
     "@astrojs/lit": "^1.0.0",
     "@webcomponents/template-shadowroot": "^0.1.0"

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.0.2"
   }

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "@astrojs/react": "^1.1.0",

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "solid-js": "^1.4.3",
     "@astrojs/solid-js": "^1.1.0"
   }

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -12,6 +12,6 @@
   "dependencies": {
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.0",
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "vue": "^3.2.37",
     "@astrojs/vue": "^1.0.0"
   }

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.0.2",
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "sass": "^1.52.2"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.0",
     "@astrojs/node": "^1.0.1",

diff --git a/examples/ssr/src/pages/cart.astro b/examples/ssr/src/pages/cart.astro
@@ -14,7 +14,7 @@ const user = { name: 'test' }; // getUser?
 const cart = await getCart(Astro.request);
 ---
 
-<html>
+<html lang="en">
 	<head>
 		<title>Cart | Online Store</title>
 		<style>

diff --git a/examples/ssr/src/pages/index.astro b/examples/ssr/src/pages/index.astro
@@ -8,7 +8,7 @@ import '../styles/common.css';
 const products = await getProducts(Astro.request);
 ---
 
-<html>
+<html lang="en">
 	<head>
 		<title>Online Store</title>
 		<style>

diff --git a/examples/ssr/src/pages/login.astro b/examples/ssr/src/pages/login.astro
@@ -3,7 +3,7 @@ import Header from '../components/Header.astro';
 import Container from '../components/Container.astro';
 ---
 
-<html>
+<html lang="en">
 	<head>
 		<title>Online Store</title>
 		<style>

diff --git a/examples/subpath/package.json b/examples/subpath/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "@astrojs/react": "^1.1.0"

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "@astrojs/markdown-remark": "^1.1.0",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3"
+    "astro": "^1.1.5"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "preact": "^10.6.5",
     "@astrojs/preact": "^1.0.2",
-    "@astrojs/mdx": "^0.11.0"
+    "@astrojs/mdx": "^0.11.1"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "preact": "^10.7.3",
     "@astrojs/preact": "^1.0.2",
     "nanostores": "^0.5.12",

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "@astrojs/tailwind": "^1.0.0",
     "autoprefixer": "^10.4.7",
     "canvas-confetti": "^1.5.1",

diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.3"
   }

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^1.1.3",
+    "astro": "^1.1.5",
     "vitest": "^0.20.3"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,19 @@
 # astro
 
+## 1.1.5
+
+### Patch Changes
+
+- [#4603](https://github.com/withastro/astro/pull/4603) [`36dee7169`](https://github.com/withastro/astro/commit/36dee7169be7f595825d3dfecb04e61cea1b2fe4) Thanks [@matthewp](https://github.com/matthewp)! - Fix error when no JSX renderer configured
+
+## 1.1.4
+
+### Patch Changes
+
+- [#4586](https://github.com/withastro/astro/pull/4586) [`16814dc71`](https://github.com/withastro/astro/commit/16814dc718614c0cce46b788470c1bc40b5cc981) Thanks [@bluwy](https://github.com/bluwy)! - Move ast-types as dev dependency
+
+- [#4585](https://github.com/withastro/astro/pull/4585) [`f018e365c`](https://github.com/withastro/astro/commit/f018e365cf22bd6b7235fe956e33b5d80fa059a1) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Add docs link to "missing adapter" error msg
+
 ## 1.1.3
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ const { @@
     } = Astro.props;
     ---
-    <html>
+    <html lang="en">
     	<head>
     		<BaseHead title={title} description={description} />
     		<style>
@@ Expand Down @@