Merge branch 'main' into ssr-markdown

.changeset/blue-mayflies-cheat.md

@@ -1,8 +1,5 @@
 ---
 'astro': patch
-'@astrojs/netlify': patch
-'@astrojs/node': patch
-'@astrojs/vercel': patch
 ---
 
 Support runtime markdown parsing

.changeset/tame-lamps-roll.md

@@ -0,0 +1,7 @@
+---
+'@astrojs/tailwind': minor
+---
+
+Removes the `applyAstroPreset` integration option. Tailwind presets can be disabled directly from the Tailwind config file by including `presets: []`
+
+See the [Tailwind preset docs](https://tailwindcss.com/docs/presets#disabling-the-default-configuration) for more details.

.github/ISSUE_TEMPLATE/---01-bug-report.yml

@@ -18,6 +18,12 @@ body:
       placeholder: 0.0.0
     validations:
       required: true
+  - type: input
+    attributes:
+      label: Are you using an SSR adapter? If so, which one?
+      placeholder: None, or Netlify, Vercel, Cloudflare, etc.
+    validations:
+      required: true
   - type: input
     attributes:
       label: What package manager are you using?

.github/labeler.yml

@@ -19,22 +19,22 @@ markdown:
 - packages/markdown/**
 
 renderer:
-- packages/renderers/**
+- packages/integrations/**
 
 framework-lit:
-- packages/renderers/renderer-lit/**
+- packages/integrations/lit/**
 
 framework-preact:
-- packages/renderers/renderer-preact/**
+- packages/integrations/preact/**
 
 framework-react:
-- packages/renderers/renderer-react/**
+- packages/integrations/react/**
 
 framework-solid:
-- packages/renderers/renderer-solid/**
+- packages/integrations/solid/**
 
 framework-svelte:
-- packages/renderers/renderer-svelte/**
+- packages/integrations/svelte/**
 
 framework-vue:
-- packages/renderers/renderer-vue/**
+- packages/integrations/vue/**

examples/blog-multiple-authors/package.json

@@ -9,11 +9,11 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "@astrojs/preact": "^0.0.2",
-    "astro": "^1.0.0-beta.5",
-    "sass": "^1.49.11"
+    "@astrojs/preact": "^0.1.1",
+    "astro": "^1.0.0-beta.10",
+    "sass": "^1.50.0"
   },
   "dependencies": {
-    "preact": "^10.7.0"
+    "preact": "^10.7.1"
   }
 }

examples/blog/package.json

@@ -9,10 +9,10 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "@astrojs/preact": "^0.0.2",
-    "astro": "^1.0.0-beta.5"
+    "@astrojs/preact": "^0.1.1",
+    "astro": "^1.0.0-beta.10"
   },
   "dependencies": {
-    "preact": "^10.7.0"
+    "preact": "^10.7.1"
   }
 }

examples/component/demo/package.json

@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@example/my-component": "workspace:*",
-    "astro": "^1.0.0-beta.5"
+    "astro": "^1.0.0-beta.10"
   }
 }

examples/component/package.json

@@ -8,6 +8,6 @@
     "serve": "astro --root demo preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.5"
+    "astro": "^1.0.0-beta.10"
   }
 }

examples/docs/README.md

@@ -1,6 +1,6 @@
 # Astro Starter Kit: Docs Site
 
-```
+```bash
 npm init astro -- --template docs
 ```
 
@@ -22,7 +22,7 @@ npm init astro -- --template docs
 All commands are run from the root of the project, from a terminal:
 
 | Command           | Action                                       |
-|:----------------  |:-------------------------------------------- |
+| :---------------- | :------------------------------------------- |
 | `npm install`     | Installs dependencies                        |
 | `npm run dev`     | Starts local dev server at `localhost:3000`  |
 | `npm run build`   | Build your production site to `./dist/`      |
@@ -34,12 +34,12 @@ To deploy your site to production, check out our [Deploy an Astro Website](https
 
 Welcome! Check out [our documentation](https://github.com/withastro/astro) or jump into our [Discord server](https://astro.build/chat).
 
-
 ## Customize This Theme
 
 ### Site metadata
 
 `src/config.ts` contains several data objects that describe metadata about your site like title, description, default language, and Open Graph details. You can customize these to match your project.
+
 ### CSS styling
 
 The theme's look and feel is controlled by a few key variables that you can customize yourself. You'll find them in the `public/theme.css` CSS file.
@@ -72,21 +72,20 @@ layout: ../../layouts/MainLayout.astro
 
 For more SEO related properties, look at `src/components/HeadSEO.astro`
 
-
 ### Sidebar navigation
 
 The sidebar navigation is controlled by the `SIDEBAR` variable in your `src/config.ts` file. You can customize the sidebar by modifying this object. A default, starter navigation has already been created for you.
 
 ```ts
 export const SIDEBAR = {
   en: [
-    { text: 'Section Header', header: true, },
-    { text: 'Introduction', link: 'en/introduction' },
-    { text: 'Page 2', link: 'en/page-2' },
-    { text: 'Page 3', link: 'en/page-3' },
+    { text: "Section Header", header: true },
+    { text: "Introduction", link: "en/introduction" },
+    { text: "Page 2", link: "en/page-2" },
+    { text: "Page 3", link: "en/page-3" },
 
-    { text: 'Another Section', header: true },
-    { text: 'Page 4', link: 'en/page-4' },
+    { text: "Another Section", header: true },
+    { text: "Page 4", link: "en/page-4" },
   ],
 };
 ```
@@ -147,7 +146,7 @@ If you plan to use Spanish as the the default language, you just need to modify
 
 ```diff
 <script>
--	window.location.pathname = `/en/introduction`;
+- window.location.pathname = `/en/introduction`;
 + window.location.pathname = `/es/introduction`;
 </script>
 ```
@@ -166,4 +165,4 @@ If that single language is not English, you can just replace `en` in directory l
 
 Note that Aglolia and Astro are not affiliated. We have no say over acceptance to the DocSearch program.
 
-If you'd prefer to remove Algolia's search and replace it with your own, check out the `src/components/Header.astro` component to see where the component is added.
+If you'd prefer to remove Algolia's search and replace it with your own, check out the `src/components/Header.astro` component to see where the component is added.

examples/docs/package.json

@@ -12,14 +12,14 @@
     "@algolia/client-search": "^4.13.0",
     "@docsearch/css": "^3.0.0",
     "@docsearch/react": "^3.0.0",
-    "@types/react": "^17.0.43",
-    "preact": "^10.7.0",
+    "@types/react": "^17.0.44",
+    "preact": "^10.7.1",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "@astrojs/preact": "^0.0.2",
+    "@astrojs/preact": "^0.1.1",
     "@astrojs/react": "^0.1.0",
-    "astro": "^1.0.0-beta.5"
+    "astro": "^1.0.0-beta.10"
   }
 }