Merge branch 'main' into main

withastro · Feb 13, 2024 · dd1de37 · dd1de37
2 parents 35b9a64 + 2168635
commit dd1de37
Show file tree

Hide file tree

Showing 447 changed files with 8,294 additions and 5,314 deletions.
diff --git a/.changeset/breezy-pets-dream.md b/.changeset/breezy-pets-dream.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/vercel": patch
+---
+
+Prevents infinite redirects when Astro `trailingSlash` configuration is set to `"always"` and "vercel.json" `trailingSlash` configuration is set to `true`
diff --git a/.changeset/silver-peaches-pump.md b/.changeset/silver-peaches-pump.md
diff --git a/.changeset/sweet-chicken-sneeze.md b/.changeset/sweet-chicken-sneeze.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Clarifies error messages in endpoint routing.
diff --git a/.changeset/thin-kangaroos-exist.md b/.changeset/thin-kangaroos-exist.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes an issue where ReadableStream wasn't canceled in dev mode
diff --git a/.changeset/wet-rivers-do.md b/.changeset/wet-rivers-do.md
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -7,13 +7,14 @@ module.exports = {
     'plugin:@typescript-eslint/recommended-type-checked',
     'plugin:@typescript-eslint/stylistic-type-checked',
     'prettier',
+    'plugin:regexp/recommended',
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     project: ['./packages/*/tsconfig.json', './tsconfig.eslint.json'],
     tsconfigRootDir: __dirname,
   },
-  plugins: ['@typescript-eslint', 'prettier', 'no-only-tests'],
+  plugins: ['@typescript-eslint', 'prettier', 'no-only-tests', 'regexp'],
   rules: {
     // These off/configured-differently-by-default rules fit well for us
     '@typescript-eslint/switch-exhaustiveness-check': 'error',
@@ -72,6 +73,9 @@ module.exports = {
     // These rules enabled by the preset configs don't work well for us
     '@typescript-eslint/await-thenable': 'off',
     'prefer-const': 'off',
+
+    // In some cases, using explicit letter-casing is more performant than the `i` flag
+    'regexp/use-ignore-case': 'off',
   },
   overrides: [
     {

diff --git a/.github/scripts/bundle-size.mjs b/.github/scripts/bundle-size.mjs
@@ -68,7 +68,7 @@ async function bundle(files) {
 		sourcemap: false,
 		target: ['es2018'],
 		outdir: 'out',
-		external: ['astro:*'],
+		external: ['astro:*', 'aria-query', 'axobject-query'],
 		metafile: true,
 	})
 

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -21,7 +21,7 @@ jobs:
       MAIN-BENCH: ${{ steps.benchmark-main.outputs.BENCH_RESULT }}
     steps:
       # https://github.com/actions/checkout/issues/331#issuecomment-1438220926
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           ref: refs/pull/${{ github.event.issue.number }}/head
@@ -30,9 +30,9 @@ jobs:
         uses: pnpm/action-setup@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 18
           cache: "pnpm"
 
       - name: Install dependencies
@@ -63,7 +63,7 @@ jobs:
         shell: bash
 
       # main benchmark
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           ref: "main"
@@ -94,7 +94,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Comment PR
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v4
         continue-on-error: true
         with:
           issue-number: ${{ github.event.issue.number }}

diff --git a/.github/workflows/check-merge.yml b/.github/workflows/check-merge.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Check if there is already a block on this PR
         id: blocked
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           issue_number:  ${{ github.event.number }}
         with:
@@ -32,14 +32,14 @@ jobs:
             return 'false'
           result-encoding: string
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: steps.blocked.outputs.result != 'true'
         with:
           fetch-depth: 0
 
       - name: Get changed files in the .changeset folder
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v42
         if: steps.blocked.outputs.result != 'true'
         with:
           files: |
@@ -63,7 +63,7 @@ jobs:
           done
 
       - name: Add label
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: steps.check.outputs.found == 'true'
         env:
           issue_number: ${{ github.event.number }}
@@ -77,7 +77,7 @@ jobs:
             });
 
       - name: Change PR Status
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         if: steps.check.outputs.found == 'true'
         env:
           issue_number: ${{ github.event.number }}

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -26,13 +26,13 @@ jobs:
     timeout-minutes: 7
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: "pnpm"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,13 +47,13 @@ jobs:
         run: git config --global core.autocrlf false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.NODE_VERSION }}
           cache: "pnpm"
@@ -77,13 +77,13 @@ jobs:
         run: git config --global core.autocrlf false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: "pnpm"
@@ -110,7 +110,7 @@ jobs:
         OS: [ubuntu-latest]
         NODE_VERSION: [18, 20.5.1]
         include:
-          - os: macos-latest
+          - os: macos-14
             NODE_VERSION: 18
           - os: windows-latest
             NODE_VERSION: 18.17.1
@@ -122,13 +122,13 @@ jobs:
         run: git config --global core.autocrlf false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.NODE_VERSION }}
           cache: "pnpm"
@@ -159,13 +159,13 @@ jobs:
         run: git config --global core.autocrlf false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.NODE_VERSION }}
           cache: "pnpm"
@@ -195,19 +195,19 @@ jobs:
         run: git config --global core.autocrlf false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.NODE_VERSION }}
           cache: "pnpm"
 
       - name: Checkout docs
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: withastro/docs
           path: smoke/docs
@@ -227,7 +227,7 @@ jobs:
 
       - name: Check if docs changed
         id: changes
-        uses: dorny/paths-filter@v2
+        uses: dorny/paths-filter@v3
         with:
           filters: |
             docs:

diff --git a/.github/workflows/cleanup-cache.yml b/.github/workflows/cleanup-cache.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cleanup caches older than 5 days
         if: github.event_name == 'schedule'

diff --git a/.github/workflows/issue-opened.yml b/.github/workflows/issue-opened.yml
@@ -12,7 +12,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.addLabels({

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,13 +30,13 @@ jobs:
     outputs:
       run_job: ${{ steps.check_files.outputs.run_job }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: "pnpm"
@@ -66,7 +66,7 @@ jobs:
     if: needs.check_for_update.outputs.run_job == 'true'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,13 +27,13 @@ jobs:
       contents: write
       id-token: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PNPM
         uses: pnpm/action-setup@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: "pnpm"

diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml
@@ -23,10 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Checkout Main into tmp
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: main
           path: main
@@ -35,7 +35,7 @@ jobs:
         uses: pnpm/action-setup@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: "pnpm"
@@ -44,7 +44,7 @@ jobs:
         run: pnpm install
 
       - name: Check Bundle Size
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { default: script } = await import('${{ github.workspace }}/.github/scripts/bundle-size.mjs')

diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Extract the snapshot name from comment body
         id: getSnapshotName
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { body } = context.payload.comment;
@@ -58,7 +58,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ steps.refs.outputs.head_ref }}
           fetch-depth: 0
@@ -69,7 +69,7 @@ jobs:
         uses: pnpm/action-setup@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org"
@@ -124,7 +124,7 @@ jobs:
           NO_COLOR: 1
 
       - name: Pull Request Notification
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
           TAG: ${{ steps.getSnapshotName.outputs.result }}
           STATUS_DATA: ${{ steps.changesets.outputs.status }}