Merge branch 'main' into pr/5478

withastro · Jan 31, 2023 · cccf936 · cccf936
2 parents 8f75400 + 66677de
commit cccf936
Show file tree

Hide file tree

Showing 169 changed files with 2,451 additions and 1,107 deletions.
diff --git a/.changeset/chilly-ads-roll.md b/.changeset/chilly-ads-roll.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/image': patch
+---
+
+`getPicture()` return object with the correct image type
diff --git a/.changeset/clever-panthers-end.md b/.changeset/clever-panthers-end.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Error overlay will now show the error's `cause` if available.
diff --git a/.changeset/fluffy-cherries-shake.md b/.changeset/fluffy-cherries-shake.md
diff --git a/.changeset/fresh-eels-speak.md b/.changeset/fresh-eels-speak.md
diff --git a/.changeset/heavy-meals-complain.md b/.changeset/heavy-meals-complain.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/image': minor
+---
+
+Allow images from outside srcDir
diff --git a/.changeset/serious-turtles-explode.md b/.changeset/serious-turtles-explode.md
diff --git a/.changeset/strong-hotels-sort.md b/.changeset/strong-hotels-sort.md
diff --git a/.changeset/ten-icons-raise.md b/.changeset/ten-icons-raise.md
diff --git a/.changeset/tidy-ties-repeat.md b/.changeset/tidy-ties-repeat.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -152,6 +152,21 @@ There are 3 contexts in which code executes:
 
 Understanding in which environment code runs, and at which stage in the process, can help clarify thinking about what Astro is doing. It also helps with debugging, for instance, if you’re working within `src/core/`, you know that your code isn’t executing within Vite, so you don’t have to debug Vite’s setup. But you will have to debug vite inside `runtime/server/`.
 
+## Branches
+
+### `main`
+
+Active Astro development happens on the [`main`](https://github.com/withastro/astro/tree/main) branch. `main` always reflects the latest code.
+
+> **Note:**
+> During certain periods, we put `main` into a [**prerelease**](https://github.com/changesets/changesets/blob/main/docs/prereleases.md#prereleases) state. Read more about [Releasing Astro](#releasing-astro).
+
+### `latest`
+
+The **stable** release of Astro can always be found on the [`latest`](https://github.com/withastro/astro/tree/latest) branch. `latest` is automatically updated every time we publish a stable (not prerelease) version of Astro.
+
+By default, `create-astro` and [astro.new](https://astro.new) point to this branch.
+
 ## Releasing Astro
 
 _Note: Only [core maintainers (L3+)](https://github.com/withastro/.github/blob/main/GOVERNANCE.md#level-3-l3---core-maintainer) can release new versions of Astro._

diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1"
+    "astro": "^2.0.4"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
-    "@astrojs/mdx": "^0.15.0",
+    "astro": "^2.0.4",
+    "@astrojs/mdx": "^0.15.2",
     "@astrojs/rss": "^2.1.0",
-    "@astrojs/sitemap": "^1.0.0"
+    "@astrojs/sitemap": "^1.0.1"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^2.0.1"
+    "astro": "^2.0.4"
   },
   "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": "^2.0.1"
+    "astro": "^2.0.4"
   },
   "devDependencies": {
     "@astrojs/deno": "^4.0.0"

diff --git a/examples/docs/README.md b/examples/docs/README.md
@@ -11,7 +11,6 @@ npm create astro@latest -- --template docs
 
 ![docs](https://user-images.githubusercontent.com/4677417/186189283-0831b9ab-d6b9-485d-8955-3057e532ab31.png)
 
-
 ## Features
 
 - ✅ **Full Markdown support**
@@ -104,10 +103,10 @@ Note the top-level `en` key: This is needed for multi-language support. You can
 
 The Astro docs template supports multiple languages out of the box. The default theme only shows `en` documentation, but you can enable multi-language support features by adding a second language to your project.
 
-To add a new language to your project, you'll want to extend the current `src/pages/[lang]/...` layout:
+To add a new language to your project, you'll want to extend the current `src/content/docs/[lang]/...` layout:
 
 ```diff
- 📂 src/pages
+ 📂 src/content/docs
  ┣ 📂 en
  ┃ ┣ 📜 page-1.md
  ┃ ┣ 📜 page-2.md

diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -11,12 +11,12 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "@astrojs/react": "^2.0.0",
-    "@astrojs/preact": "^2.0.0",
+    "@astrojs/react": "^2.0.2",
+    "@astrojs/preact": "^2.0.1",
     "@algolia/client-search": "^4.13.1",
     "@docsearch/css": "^3.1.0",
     "@docsearch/react": "^3.1.0",

diff --git a/examples/docs/src/layouts/MainLayout.astro b/examples/docs/src/layouts/MainLayout.astro
@@ -17,7 +17,7 @@ type Props = CollectionEntry<'docs'>['data'] & {
 const { headings, ...data } = Astro.props;
 const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 const currentPage = Astro.url.pathname;
-const currentFile = `src/pages${currentPage.replace(/\/$/, '')}.md`;
+const currentFile = `src/content/docs${currentPage.replace(/\/$/, '')}.md`;
 const githubEditUrl = `${GITHUB_EDIT_URL}/${currentFile}`;
 ---
 

diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "alpinejs": "^3.10.2",
-    "@astrojs/alpinejs": "^0.1.2",
+    "@astrojs/alpinejs": "^0.1.3",
     "@types/alpinejs": "^3.7.0"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "lit": "^2.2.5",
-    "@astrojs/lit": "^1.1.0",
+    "@astrojs/lit": "^1.1.1",
     "@webcomponents/template-shadowroot": "^0.1.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -11,17 +11,17 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "solid-js": "^1.4.3",
     "svelte": "^3.48.0",
     "vue": "^3.2.37",
-    "@astrojs/preact": "^2.0.0",
-    "@astrojs/react": "^2.0.0",
-    "@astrojs/solid-js": "^2.0.0",
-    "@astrojs/svelte": "^2.0.0",
-    "@astrojs/vue": "^2.0.0"
+    "@astrojs/preact": "^2.0.1",
+    "@astrojs/react": "^2.0.2",
+    "@astrojs/solid-js": "^2.0.1",
+    "@astrojs/svelte": "^2.0.1",
+    "@astrojs/vue": "^2.0.1"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "preact": "^10.7.3",
-    "@astrojs/preact": "^2.0.0",
+    "@astrojs/preact": "^2.0.1",
     "@preact/signals": "^1.1.0"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "@astrojs/react": "^2.0.0",
+    "@astrojs/react": "^2.0.2",
     "@types/react": "^18.0.10",
     "@types/react-dom": "^18.0.5"
   }

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "solid-js": "^1.4.3",
-    "@astrojs/solid-js": "^2.0.0"
+    "@astrojs/solid-js": "^2.0.1"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "svelte": "^3.48.0",
-    "@astrojs/svelte": "^2.0.0",
-    "astro": "^2.0.1"
+    "@astrojs/svelte": "^2.0.1",
+    "astro": "^2.0.4"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "vue": "^3.2.37",
-    "@astrojs/vue": "^2.0.0"
+    "@astrojs/vue": "^2.0.1"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^5.0.0",
-    "astro": "^2.0.1"
+    "@astrojs/node": "^5.0.1",
+    "astro": "^2.0.4"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^2.0.1"
+    "astro": "^2.0.4"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1"
+    "astro": "^2.0.4"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1"
+    "astro": "^2.0.4"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1"
+    "astro": "^2.0.4"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -12,10 +12,10 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "svelte": "^3.48.0",
-    "@astrojs/svelte": "^2.0.0",
-    "@astrojs/node": "^5.0.0",
+    "@astrojs/svelte": "^2.0.1",
+    "@astrojs/node": "^5.0.1",
     "concurrently": "^7.2.1",
     "unocss": "^0.15.6",
     "vite-imagetools": "^4.0.4"

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
-    "@astrojs/markdown-remark": "^2.0.0",
+    "astro": "^2.0.4",
+    "@astrojs/markdown-remark": "^2.0.1",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.0.1",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1"
+    "astro": "^2.0.4"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "preact": "^10.6.5",
-    "@astrojs/preact": "^2.0.0",
-    "@astrojs/mdx": "^0.15.0"
+    "@astrojs/preact": "^2.0.1",
+    "@astrojs/mdx": "^0.15.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "preact": "^10.7.3",
-    "@astrojs/preact": "^2.0.0",
+    "@astrojs/preact": "^2.0.1",
     "nanostores": "^0.5.12",
     "@nanostores/preact": "^0.1.3"
   }

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^0.15.0",
-    "@astrojs/tailwind": "^3.0.0",
+    "@astrojs/mdx": "^0.15.2",
+    "@astrojs/tailwind": "^3.0.1",
     "@types/canvas-confetti": "^1.4.3",
-    "astro": "^2.0.1",
+    "astro": "^2.0.4",
     "autoprefixer": "^10.4.7",
     "canvas-confetti": "^1.5.1",
     "postcss": "^8.4.14",

diff --git a/examples/with-tailwindcss/src/components/Button.astro b/examples/with-tailwindcss/src/components/Button.astro
@@ -4,7 +4,7 @@
 ---
 
 <button
-	class="py-2 px-4 bg-purple-500 text-white font-semibold rounded-lg shadow-md hover:bg-purple-700 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-opacity-75"
+	class="appearance-none py-2 px-4 bg-purple-500 text-white font-semibold rounded-lg shadow-md hover:bg-purple-700 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:ring-opacity-75"
 >
 	<slot />
 </button>

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