Merge branch 'main' into simple-nested-hydration

.changeset/cool-birds-prove.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix missing styles for Markdoc files in development

.changeset/early-students-taste.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Remove `slash` package

.changeset/flat-houses-brush.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': minor
+---
+
+feat: support svelte 4

.changeset/flat-papayas-invite.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Allow astro to be installed underneath a folder with leading slashes

.changeset/happy-stingrays-carry.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Handle esbuild 0.18 changes

.changeset/nervous-paws-knock.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Fix redirects for root page when using `trailingSlash: "always"`

.changeset/rich-pumpkins-change.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/internal-helpers': patch
+---
+
+Add `slash` path utility

.changeset/tiny-lemons-sit.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Prevent accidental inclusion of page CSS in dev mode

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

@@ -53,6 +53,13 @@ body:
       description: A clear and concise description of what the bug is.
     validations:
       required: true
+  - type: textarea
+    id: bug-expectation
+    attributes:
+      label: What's the expected result?
+      description: Describe what you expect to happen.
+    validations:
+      required: true
   - type: input
     id: bug-reproduction
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -4,7 +4,7 @@ contact_links:
     url: https://github.com/withastro/docs
     about: File an issue or make an improvement to the docs website.
   - name: 💡 Ideas for New Features, Improvements and RFCs
-    url: https://github.com/withastro/rfcs/discussions
+    url: https://github.com/withastro/roadmap/discussions
     about: Propose and discuss future improvements to Astro
   - name: 👾 Chat
     url: https://astro.build/chat

.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
     paths-ignore:
       - ".vscode/**"
       - "**/*.md"
+      - ".github/ISSUE_TEMPLATE/**"
 
 # Automatically cancel older in-progress jobs on the same branch
 concurrency:
@@ -148,7 +149,7 @@ jobs:
       - name: Use Deno
         uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.26.1
+          deno-version: v1.34.1
 
       - name: Install dependencies
         run: pnpm install

.github/workflows/format.yml

@@ -1,4 +1,4 @@
-name: "Format Code"
+name: Format
 
 on:
   workflow_dispatch:
@@ -7,33 +7,9 @@ on:
       - main
 
 jobs:
-  format:
+  prettier:
     if: github.repository_owner == 'withastro'
-    runs-on: ubuntu-latest
-    env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
-    steps:
-      - name: Check out code using Git
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-          # Needs access to push to main
-          token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
-      - name: Setup PNPM
-        uses: pnpm/action-setup@v2
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: "pnpm"
-      - name: Install dependencies
-        run: pnpm install
-      - name: Format code
-        run: pnpm run format:ci
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: "[ci] format"
-          branch: ${{ github.head_ref }}
-          commit_user_name: fredkbot
-          commit_user_email: fred+astrobot@astro.build
+    uses: withastro/automation/.github/workflows/format.yml@main
+    with:
+      command: "format:ci"
+    secrets: inherit

.github/workflows/main.yml

@@ -18,21 +18,11 @@ jobs:
   congrats:
     name: congratsbot
     if: ${{ github.repository_owner == 'withastro' }}
-    runs-on: ubuntu-latest
-    steps:
-      - id: setup
-        env:
-          MESSAGE: ${{ github.event.commits[0].message }}
-        run: |
-          TRIMMED=$(echo "$MESSAGE" | sed '1!d;q')
-          echo "::set-output name=COMMIT_MSG::${TRIMMED}"
-      - name: Send a Discord notification when a PR is merged
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }}
-          # DISCORD_AVATAR: ${{ github.event.pull_request.user.avatar_url }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: "**Merged!** ${{ github.event.commits[0].author.name }}: [`${{ steps.setup.outputs.COMMIT_MSG }}`](<https://github.com/withastro/astro/commit/${{ github.event.commits[0].id }}>)"
+    uses: withastro/automation/.github/workflows/congratsbot.yml@main
+    with:
+      EMOJIS: '🎉,🎊,🧑‍🚀,🥳,🙌,🚀,👏,<:houston_golden:1068575433647456447>,<:astrocoin:894990669515489301>,<:astro_pride:1085944201587458169>'
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_CONGRATS }}
 
   check_for_update:
     name: Check for Updates

.github/workflows/nightly.yml

@@ -1,4 +1,4 @@
-name: "Nightly"
+name: Nightly
 
 on:
   schedule:
@@ -7,76 +7,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  stat:
-    # Temporarily disable since stat collection hasn't work for a while
-    if: false
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code using Git
-        uses: actions/checkout@v3
-
-      - name: Setup PNPM
-        uses: pnpm/action-setup@v2
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Collect stats
-        run: node scripts/stats/index.js
-        env:
-          # Needs access to collect stats from the GitHub API
-          GITHUB_TOKEN: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
-
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: "[ci] collect stats"
-          branch: ${{ github.head_ref }}
-          # Needs access to push to main
-          token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
-
   lockfile:
     if: github.repository_owner == 'withastro'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code using Git
-        uses: actions/checkout@v3
-
-      - name: Setup PNPM
-        uses: pnpm/action-setup@v2
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: "pnpm"
-
-      - name: Delete the existing pnpm-lock.yaml file
-        run: rm pnpm-lock.yaml
-
-      # https://github.com/pnpm/pnpm/issues/6463
-      - name: Update .npmrc to update packages to latest
-        run: echo "resolution-mode=highest" >> .npmrc
-
-      - name: Create a fresh pnpm lockfile (no install)
-        run: pnpm install --lockfile-only
-
-      - name: Create Pull Request
-        id: createpr
-        uses: peter-evans/create-pull-request@v5
-        with:
-          branch: ci/lockfile
-          # Access token is needed to trigger CI on this PR
-          token: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
-          commit-message: "[ci] update lockfile"
-          add-paths: pnpm-lock.yaml
-          title: "[ci] update lockfile"
-          body: >
-            This PR is auto-generated by a nightly GitHub action.
-            It should automatically be merged if tests pass.
+    uses: withastro/automation/.github/workflows/lockfile.yml@main
+    secrets: inherit

.prettierignore

@@ -12,14 +12,11 @@ packages/markdown/component/Markdown.astro
 **/fixtures
 **/vendor
 **/.vercel
-examples/docs/**/*.md
-examples/blog/**/*.md
 
 # Directories
 .github
 .changeset
 
 # Files
-README.md
 packages/webapi/mod.d.ts
 pnpm-lock.yaml

.prettierrc.js → .prettierrc.cjs

@@ -8,14 +8,6 @@ module.exports = {
   useTabs: true,
   plugins: ['./node_modules/prettier-plugin-astro'],
   overrides: [
-    {
-      // Changesets run Prettier using our configuration, however it uses a very old version of Prettier that does
-      // not support our plugin and it ends up doing more harm than good. As such, we'll disable our plugin for changelogs
-      files: ['CHANGELOG.md'],
-      options: {
-        plugins: [],
-      },
-    },
     {
       files: ['.*', '*.json', '*.md', '*.toml', '*.yml'],
       options: {

CONTRIBUTING.md

@@ -11,7 +11,7 @@ We welcome contributions of any size and skill level. As an open source project,
 
 ```shell
 node: "^>=16.12.0"
-pnpm: "^8.2.0"
+pnpm: "^8.6.2"
 # otherwise, your build will fail
 ```