Merge branch 'main' into fix/image-ssg-querystring

withastro · Aug 22, 2022 · 64619a1 · 64619a1
2 parents 82a9d65 + 439f1d1
commit 64619a1
Show file tree

Hide file tree

Showing 161 changed files with 610 additions and 207 deletions.
diff --git a/.changeset/few-mayflies-invent.md b/.changeset/few-mayflies-invent.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Allow user config to set `markdown.drafts` option
diff --git a/.changeset/giant-ants-smoke.md b/.changeset/giant-ants-smoke.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Refactor static build config merge
diff --git a/.changeset/grumpy-wombats-laugh.md b/.changeset/grumpy-wombats-laugh.md
diff --git a/.changeset/hip-bobcats-divide.md b/.changeset/hip-bobcats-divide.md
diff --git a/.changeset/orange-llamas-glow.md b/.changeset/orange-llamas-glow.md
diff --git a/.changeset/rare-comics-roll.md b/.changeset/rare-comics-roll.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Preserve all error stack lines
diff --git a/.changeset/six-jars-push.md b/.changeset/six-jars-push.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Provide correct MIME type for dynamic endpoint routes in dev
diff --git a/examples/basics/README.md b/examples/basics/README.md
@@ -11,7 +11,7 @@ Inside of your Astro project, you'll see the following folders and files:
 ```
 /
 ├── public/
-│   └── favicon.ico
+│   └── favicon.svg
 ├── src/
 │   ├── components/
 │   │   └── Layout.astro

diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "devDependencies": {
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   }
 }
diff --git a/examples/basics/public/favicon.ico b/examples/basics/public/favicon.ico
diff --git a/examples/blog/public/astro.svg → examples/basics/public/favicon.svg b/examples/blog/public/astro.svg → examples/basics/public/favicon.svg
diff --git a/examples/basics/src/layouts/Layout.astro b/examples/basics/src/layouts/Layout.astro
@@ -11,7 +11,7 @@ const { title } = Astro.props as Props;
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width" />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<meta name="generator" content={Astro.generator} />
 		<title>{title}</title>
 	</head>

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "devDependencies": {
-    "@astrojs/mdx": "^0.9.0",
+    "@astrojs/mdx": "^0.10.0",
     "@astrojs/rss": "^1.0.0",
     "@astrojs/sitemap": "^1.0.0",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   }
 }
diff --git a/examples/blog/public/favicon.svg b/examples/blog/public/favicon.svg
diff --git a/examples/blog/src/components/BaseHead.astro b/examples/blog/src/components/BaseHead.astro
@@ -15,7 +15,7 @@ const { title, description, image = '/placeholder-social.jpg' } = Astro.props;
 <!-- Global Metadata -->
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
-<link rel="icon" type="image/svg+xml" href="/astro.svg" />
+<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 <meta name="generator" content={Astro.generator} />
 
 <!-- Primary Meta Tags -->

diff --git a/examples/blog/src/pages/blog/markdown-style-guide.md b/examples/blog/src/pages/blog/markdown-style-guide.md
@@ -27,7 +27,7 @@ Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sap
 
 ## Images
 
-![This is a placeholder image description](/placeholder-social.png)
+![This is a placeholder image description](/placeholder-social.jpg)
 
 ## Blockquotes
 

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.0.5"
+    "astro": "^1.0.6"
   }
 }
diff --git a/examples/component/demo/public/favicon.ico b/examples/component/demo/public/favicon.ico
diff --git a/examples/component/demo/public/favicon.svg b/examples/component/demo/public/favicon.svg
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -8,6 +8,6 @@
     "serve": "astro --root demo preview"
   },
   "devDependencies": {
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -21,6 +21,6 @@
   "devDependencies": {
     "@astrojs/preact": "^1.0.2",
     "@astrojs/react": "^1.0.0",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   }
 }
diff --git a/examples/docs/public/favicon.ico b/examples/docs/public/favicon.ico
diff --git a/examples/docs/public/favicon.svg b/examples/docs/public/favicon.svg
diff --git a/examples/docs/src/components/HeadCommon.astro b/examples/docs/src/components/HeadCommon.astro
@@ -9,7 +9,6 @@ import '../styles/index.css';
 <meta name="generator" content={Astro.generator} />
 
 <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-<link rel="alternate icon" type="image/x-icon" href="/favicon.ico" />
 
 <link rel="sitemap" href="/sitemap.xml" />
 

diff --git a/examples/docs/src/components/LeftSidebar/LeftSidebar.astro b/examples/docs/src/components/LeftSidebar/LeftSidebar.astro
@@ -9,8 +9,8 @@ const sidebarSections = SIDEBAR[langCode].reduce((col, item, i) => {
 	// If the first item is not a section header, create a new container section.
 	if (i === 0) {
 		if (!item.header) {
-			const pesudoSection = { text: '' };
-			col.push({ ...pesudoSection, children: [] });
+			const pseudoSection = { text: '' };
+			col.push({ ...pseudoSection, children: [] });
 		}
 	}
 	if (item.header) {

diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "devDependencies": {
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   }
 }
diff --git a/examples/env-vars/public/favicon.ico b/examples/env-vars/public/favicon.ico
diff --git a/examples/env-vars/public/favicon.svg b/examples/env-vars/public/favicon.svg
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@types/alpinejs": "^3.7.0",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   },
   "dependencies": {
     "alpinejs": "^3.10.2"

diff --git a/examples/framework-alpine/public/favicon.ico b/examples/framework-alpine/public/favicon.ico
diff --git a/examples/framework-alpine/public/favicon.svg b/examples/framework-alpine/public/favicon.svg
diff --git a/examples/framework-alpine/src/pages/index.astro b/examples/framework-alpine/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter.astro';
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<style>
 			html,
 			body {

diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@astrojs/lit": "^1.0.0",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/framework-lit/public/favicon.ico b/examples/framework-lit/public/favicon.ico
diff --git a/examples/framework-lit/public/favicon.svg b/examples/framework-lit/public/favicon.svg
diff --git a/examples/framework-lit/src/pages/index.astro b/examples/framework-lit/src/pages/index.astro
@@ -12,7 +12,7 @@ import { MyCounter } from '../components/my-counter.js';
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<title>Demo</title>
 	</head>
 	<body>

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -15,7 +15,7 @@
     "@astrojs/solid-js": "^1.0.0",
     "@astrojs/svelte": "^1.0.0",
     "@astrojs/vue": "^1.0.0",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   },
   "dependencies": {
     "preact": "^10.7.3",

diff --git a/examples/framework-multiple/public/favicon.ico b/examples/framework-multiple/public/favicon.ico
diff --git a/examples/framework-multiple/public/favicon.svg b/examples/framework-multiple/public/favicon.svg
diff --git a/examples/framework-multiple/src/pages/index.astro b/examples/framework-multiple/src/pages/index.astro
@@ -20,7 +20,7 @@ import SvelteCounter from '../components/SvelteCounter.svelte';
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 	</head>
 	<body>
 		<main>

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^1.0.2",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   },
   "dependencies": {
     "preact": "^10.7.3"

diff --git a/examples/framework-preact/public/favicon.ico b/examples/framework-preact/public/favicon.ico
diff --git a/examples/framework-preact/public/favicon.svg b/examples/framework-preact/public/favicon.svg
diff --git a/examples/framework-preact/src/pages/index.astro b/examples/framework-preact/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter';
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<style>
 			html,
 			body {

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -13,7 +13,7 @@
     "@astrojs/react": "^1.0.0",
     "@types/react": "^18.0.10",
     "@types/react-dom": "^18.0.5",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   },
   "dependencies": {
     "react": "^18.1.0",

diff --git a/examples/framework-react/public/favicon.ico b/examples/framework-react/public/favicon.ico
diff --git a/examples/framework-react/public/favicon.svg b/examples/framework-react/public/favicon.svg
diff --git a/examples/framework-react/src/pages/index.astro b/examples/framework-react/src/pages/index.astro
@@ -14,7 +14,7 @@ const someProps = {
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<style>
 			html,
 			body {

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@astrojs/solid-js": "^1.0.0",
-    "astro": "^1.0.5"
+    "astro": "^1.0.6"
   },
   "dependencies": {
     "solid-js": "^1.4.3"

diff --git a/examples/framework-solid/public/favicon.ico b/examples/framework-solid/public/favicon.ico
diff --git a/examples/framework-solid/public/favicon.svg b/examples/framework-solid/public/favicon.svg
diff --git a/examples/framework-solid/src/pages/index.astro b/examples/framework-solid/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter';
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
 		<meta name="generator" content={Astro.generator} />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
 		<style>
 			html,
 			body {