Merge branch 'main' into chore/esbuild-up

withastro · Apr 10, 2022 · 9dcdc98 · 9dcdc98
2 parents f430d17 + ce0c54a
commit 9dcdc98
Show file tree

Hide file tree

Showing 37 changed files with 198 additions and 67 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -62,9 +62,13 @@
   "changesets": [
     "angry-suits-thank",
     "big-yaks-invite",
+    "calm-dolphins-remain",
     "dirty-trains-yawn",
+    "dull-bobcats-clean",
     "empty-pens-talk",
+    "forty-boats-remain",
     "nervous-chairs-check",
+    "odd-squids-rest",
     "shiny-rice-worry",
     "sour-laws-raise",
     "stale-walls-whisper",

diff --git a/.changeset/shaggy-pans-buy.md b/.changeset/shaggy-pans-buy.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Update JSDoc comments that get shown to users through editor integration
diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
-    "astro": "^1.0.0-beta.4",
+    "astro": "^1.0.0-beta.5",
     "sass": "^1.49.11"
   },
   "dependencies": {

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "preact": "^10.7.0"

diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@example/my-component": "workspace:*",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
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.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -20,6 +20,6 @@
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
     "@astrojs/react": "^0.1.0",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/lit": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -15,7 +15,7 @@
     "@astrojs/solid-js": "^0.0.4-beta.0",
     "@astrojs/svelte": "^0.0.2",
     "@astrojs/vue": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "preact": "^10.7.0"

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/react": "^0.1.0",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "react": "^18.0.0",

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/solid-js": "^0.0.4-beta.0",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "solid-js": "^1.3.13"

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/svelte": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "svelte": "^3.46.6"

diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/vue": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "vue": "^3.2.31"

diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json
@@ -15,7 +15,7 @@
     "@astrojs/sitemap": "^0.1.0",
     "@astrojs/tailwind": "^0.1.0",
     "@astrojs/turbolinks": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
-    "astro": "^1.0.0-beta.4",
+    "astro": "^1.0.0-beta.5",
     "sass": "^1.49.11"
   },
   "dependencies": {

diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@astrojs/node": "^0.0.2",
     "@astrojs/svelte": "^0.0.2",
-    "astro": "^1.0.0-beta.4",
+    "astro": "^1.0.0-beta.5",
     "concurrently": "^7.1.0",
     "lightcookie": "^1.0.25",
     "unocss": "^0.15.6",

diff --git a/examples/starter/package.json b/examples/starter/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/subpath/package.json b/examples/subpath/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/react": "^0.1.0",
-    "astro": "^1.0.0-beta.4",
+    "astro": "^1.0.0-beta.5",
     "sass": "^1.49.11"
   },
   "dependencies": {

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "^0.8.1",
-    "astro": "^1.0.0-beta.4",
+    "astro": "^1.0.0-beta.5",
     "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
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "^0.8.1",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^0.1.0",
     "@astrojs/svelte": "^0.0.2",
     "@astrojs/vue": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   },
   "dependencies": {
     "preact": "^10.7.0",

diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -25,6 +25,6 @@
     "@astrojs/solid-js": "^0.0.4-beta.0",
     "@astrojs/svelte": "^0.0.2",
     "@astrojs/vue": "^0.0.2",
-    "astro": "^1.0.0-beta.4"
+    "astro": "^1.0.0-beta.5"
   }
 }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/tailwind": "^0.1.0",
-    "astro": "^1.0.0-beta.4",
+    "astro": "^1.0.0-beta.5",
     "autoprefixer": "^10.4.4",
     "canvas-confetti": "^1.5.1",
     "postcss": "^8.4.12",

diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.4",
+    "astro": "^1.0.0-beta.5",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.2"
   }

diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,20 @@
 # astro
 
+## 1.0.0-beta.5
+
+### Patch Changes
+
+- [#3026](https://github.com/withastro/astro/pull/3026) [`4b0f27d9`](https://github.com/withastro/astro/commit/4b0f27d9ffa6ec90e898de504588ba92630064c0) Thanks [@matthewp](https://github.com/matthewp)! - Fix for adding set-cookie multiple times
+
+* [#3020](https://github.com/withastro/astro/pull/3020) [`c773dcde`](https://github.com/withastro/astro/commit/c773dcde317d46e3f8e68088cda580c30bc8e1da) Thanks [@tony-sull](https://github.com/tony-sull)! - Add support for advanced CSS imports with `?raw` and `?url`
+
+  > ⚠️WARNING⚠️:
+  > Be careful when bypassing Astro's built-in CSS bundling! Styles won't be included in the built output - this is best used in combination with `set:html` to inline styles directly into the built HTML page.
+
+- [#3022](https://github.com/withastro/astro/pull/3022) [`8c04ff1f`](https://github.com/withastro/astro/commit/8c04ff1f0bea42d033832ce5047076e315cb38a3) Thanks [@matthewp](https://github.com/matthewp)! - Allows adapters to export default
+
+* [#3021](https://github.com/withastro/astro/pull/3021) [`7e9d82d7`](https://github.com/withastro/astro/commit/7e9d82d75e4b19993b4246d3546169c8476702c4) Thanks [@matthewp](https://github.com/matthewp)! - Warn when attempting to access headers in SSG mode
+
 ## 1.0.0-beta.4
 
 ### Patch Changes

diff --git a/packages/astro/env.d.ts b/packages/astro/env.d.ts
@@ -4,8 +4,9 @@ type Astro = import('astro').AstroGlobal;
 
 // We duplicate the description here because editors won't show the JSDoc comment from the imported type (but will for its properties, ex: Astro.request will show the AstroGlobal.request description)
 /**
- * Astro.* available in all components
- * Docs: https://docs.astro.build/reference/api-reference/#astro-global
+ * Astro global available in all contexts in .astro files
+ *
+ * [Astro documentation](https://docs.astro.build/reference/api-reference/#astro-global)
  */
 declare const Astro: Readonly<Astro>;
 

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",