Merge branch 'main' into next

2024-12-30 22:03:56 -05:00 · 2024-11-22 11:06:44 +00:00 · 2024-11-22 11:06:44 +00:00 · a0811758e3
commit a0811758e3
parent 10beb174e5 3dc714ae4b
5 changed files with 58 additions and 99 deletions
--- a/.changeset/unlucky-kids-compete.md
+++ b/.changeset/unlucky-kids-compete.md
@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a regression where Astro was trying to access `Request.headers`
--- a/.github/workflows/snapshot-release.yml
+++ b/.github/workflows/snapshot-release.yml
@ -102,6 +102,8 @@ jobs:
        id: publish
        run: |
          GITHUB_ACTIONS=0 pnpm run build > build.output.txt 2>&1
+          # Snapshots don't work in pre mode. See https://github.com/changesets/changesets/issues/1195
+          pnpm exec changeset pre exit || true
          pnpm exec changeset publish --tag experimental--${{ steps.getSnapshotName.outputs.result }} > publish.output.txt 2>&1

          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
--- a/package.json
+++ b/package.json
@ -57,7 +57,7 @@
    "@astrojs/check": "^0.9.4",
    "@biomejs/biome": "1.9.3",
    "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.9",
+    "@changesets/cli": "^2.27.10",
    "@types/node": "^18.17.8",
    "esbuild": "^0.21.5",
    "eslint": "^9.14.0",
--- a/packages/astro/src/core/middleware/noop-middleware.ts
+++ b/packages/astro/src/core/middleware/noop-middleware.ts
@ -1,7 +1,8 @@
 import type { MiddlewareHandler } from '../../types/public/common.js';
 import { NOOP_MIDDLEWARE_HEADER } from '../constants.js';

-export const NOOP_MIDDLEWARE_FN: MiddlewareHandler = (ctx, next) => {
-	ctx.request.headers.set(NOOP_MIDDLEWARE_HEADER, 'true');
-	return next();
+export const NOOP_MIDDLEWARE_FN: MiddlewareHandler = async (_ctx, next) => {
+	const response = await next();
+	response.headers.set(NOOP_MIDDLEWARE_HEADER, 'true');
+	return response;
 };
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -26,8 +26,8 @@ importers:
        specifier: ^0.5.0
        version: 0.5.0
      '@changesets/cli':
-        specifier: ^2.27.9
-        version: 2.27.9
+        specifier: ^2.27.10
+        version: 2.27.10
      '@types/node':
        specifier: ^18.17.8
        version: 18.19.50
@ -5940,11 +5940,11 @@ packages:
    engines: {node: '>=18.0.0'}
    hasBin: true

-  '@changesets/apply-release-plan@7.0.5':
-    resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==}
+  '@changesets/apply-release-plan@7.0.6':
+    resolution: {integrity: sha512-TKhVLtiwtQOgMAC0fCJfmv93faiViKSDqr8oMEqrnNs99gtSC1sZh/aEMS9a+dseU1ESZRCK+ofLgGY7o0fw/Q==}

-  '@changesets/assemble-release-plan@6.0.4':
-    resolution: {integrity: sha512-nqICnvmrwWj4w2x0fOhVj2QEGdlUuwVAwESrUo5HLzWMI1rE5SWfsr9ln+rDqWB6RQ2ZyaMZHUcU7/IRaUJS+Q==}
+  '@changesets/assemble-release-plan@6.0.5':
+    resolution: {integrity: sha512-IgvBWLNKZd6k4t72MBTBK3nkygi0j3t3zdC1zrfusYo0KpdsvnDjrMM9vPnTCLCMlfNs55jRL4gIMybxa64FCQ==}

  '@changesets/changelog-git@0.2.0':
    resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==}
@ -5952,12 +5952,12 @@ packages:
  '@changesets/changelog-github@0.5.0':
    resolution: {integrity: sha512-zoeq2LJJVcPJcIotHRJEEA2qCqX0AQIeFE+L21L8sRLPVqDhSXY8ZWAt2sohtBpFZkBwu+LUwMSKRr2lMy3LJA==}

-  '@changesets/cli@2.27.9':
-    resolution: {integrity: sha512-q42a/ZbDnxPpCb5Wkm6tMVIxgeI9C/bexntzTeCFBrQEdpisQqk8kCHllYZMDjYtEc1ZzumbMJAG8H0Z4rdvjg==}
+  '@changesets/cli@2.27.10':
+    resolution: {integrity: sha512-PfeXjvs9OfQJV8QSFFHjwHX3QnUL9elPEQ47SgkiwzLgtKGyuikWjrdM+lO9MXzOE22FO9jEGkcs4b+B6D6X0Q==}
    hasBin: true

-  '@changesets/config@3.0.3':
-    resolution: {integrity: sha512-vqgQZMyIcuIpw9nqFIpTSNyc/wgm/Lu1zKN5vECy74u95Qx/Wa9g27HdgO4NkVAaq+BGA8wUc/qvbvVNs93n6A==}
+  '@changesets/config@3.0.4':
+    resolution: {integrity: sha512-+DiIwtEBpvvv1z30f8bbOsUQGuccnZl9KRKMM/LxUHuDu5oEjmN+bJQ1RIBKNJjfYMQn8RZzoPiX0UgPaLQyXw==}

  '@changesets/errors@0.2.0':
    resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==}
@ -5968,14 +5968,14 @@ packages:
  '@changesets/get-github-info@0.6.0':
    resolution: {integrity: sha512-v/TSnFVXI8vzX9/w3DU2Ol+UlTZcu3m0kXTjTT4KlAdwSvwutcByYwyYn9hwerPWfPkT2JfpoX0KgvCEi8Q/SA==}

-  '@changesets/get-release-plan@4.0.4':
-    resolution: {integrity: sha512-SicG/S67JmPTrdcc9Vpu0wSQt7IiuN0dc8iR5VScnnTVPfIaLvKmEGRvIaF0kcn8u5ZqLbormZNTO77bCEvyWw==}
+  '@changesets/get-release-plan@4.0.5':
+    resolution: {integrity: sha512-E6wW7JoSMcctdVakut0UB76FrrN3KIeJSXvB+DHMFo99CnC3ZVnNYDCVNClMlqAhYGmLmAj77QfApaI3ca4Fkw==}

  '@changesets/get-version-range-type@0.4.0':
    resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==}

-  '@changesets/git@3.0.1':
-    resolution: {integrity: sha512-pdgHcYBLCPcLd82aRcuO0kxCDbw/yISlOtkmwmE8Odo1L6hSiZrBOsRl84eYG7DRCab/iHnOkWqExqc4wxk2LQ==}
+  '@changesets/git@3.0.2':
+    resolution: {integrity: sha512-r1/Kju9Y8OxRRdvna+nxpQIsMsRQn9dhhAZt94FLDeu0Hij2hnOozW8iqnHBgvu+KdnJppCveQwK4odwfw/aWQ==}

  '@changesets/logger@0.1.1':
    resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==}
@ -5986,8 +5986,8 @@ packages:
  '@changesets/pre@2.0.1':
    resolution: {integrity: sha512-vvBJ/If4jKM4tPz9JdY2kGOgWmCowUYOi5Ycv8dyLnEE8FgpYYUo1mgJZxcdtGGP3aG8rAQulGLyyXGSLkIMTQ==}

-  '@changesets/read@0.6.1':
-    resolution: {integrity: sha512-jYMbyXQk3nwP25nRzQQGa1nKLY0KfoOV7VLgwucI0bUO8t8ZLCr6LZmgjXsiKuRDc+5A6doKPr9w2d+FEJ55zQ==}
+  '@changesets/read@0.6.2':
+    resolution: {integrity: sha512-wjfQpJvryY3zD61p8jR87mJdyx2FIhEcdXhKUqkja87toMrP/3jtg/Yg29upN+N4Ckf525/uvV7a4tzBlpk6gg==}

  '@changesets/should-skip-package@0.1.1':
    resolution: {integrity: sha512-H9LjLbF6mMHLtJIc/eHR9Na+MifJ3VxtgP/Y+XLn4BF7tDTEN1HNYtH6QMcjP1uxp9sjaFYmW8xqloaCi/ckTg==}
@ -7958,9 +7958,6 @@ packages:
  cross-argv@2.0.0:
    resolution: {integrity: sha512-YIaY9TR5Nxeb8SMdtrU8asWVM4jqJDNDYlKV21LxtYcfNJhp1kEsgSa6qXwXgzN0WQWGODps0+TlGp2xQSHwOg==}

-  cross-spawn@5.1.0:
-    resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
-
  cross-spawn@7.0.3:
    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
    engines: {node: '>= 8'}
@ -9115,9 +9112,6 @@ packages:
  lru-cache@10.4.3:
    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}

-  lru-cache@4.1.5:
-    resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
-
  lru-cache@5.1.1:
    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}

@ -10039,9 +10033,6 @@ packages:
  proxy-from-env@1.1.0:
    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}

-  pseudomap@1.0.2:
-    resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
-
  psl@1.9.0:
    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}

@ -10354,18 +10345,10 @@ packages:
    resolution: {integrity: sha512-vHUeXJU1UvlO/BNwTpT0x/r53WkLUVxrmb5JTgW92fdFCFk0ispLMAeu/jPO2vjkXM1fYUi3K7/qcLF47pwM1A==}
    engines: {libvips: '>=8.15.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0}

-  shebang-command@1.2.0:
-    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
-    engines: {node: '>=0.10.0'}
-
  shebang-command@2.0.0:
    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
    engines: {node: '>=8'}

-  shebang-regex@1.0.0:
-    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
-    engines: {node: '>=0.10.0'}
-
  shebang-regex@3.0.0:
    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
    engines: {node: '>=8'}
@ -10456,8 +10439,8 @@ packages:
  space-separated-tokens@2.0.2:
    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}

-  spawndamnit@2.0.0:
-    resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==}
+  spawndamnit@3.0.1:
+    resolution: {integrity: sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==}

  speakingurl@14.0.1:
    resolution: {integrity: sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==}
@ -11250,10 +11233,6 @@ packages:
    resolution: {integrity: sha512-ysVYmw6+ZBhx3+ZkcPwRuJi38ZOTLJJ33PSHaitLxSKUMsh0LkKd0nC69zZCwt5D+AYUcMK2hhw4yWny20vSGg==}
    engines: {node: '>=18.12'}

-  which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-
  which@2.0.2:
    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
    engines: {node: '>= 8'}
@ -11328,9 +11307,6 @@ packages:
    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
    engines: {node: '>=10'}

-  yallist@2.1.2:
-    resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
-
  yallist@3.1.1:
    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}

@ -11880,11 +11856,11 @@ snapshots:

  '@builder.io/partytown@0.10.2': {}

-  '@changesets/apply-release-plan@7.0.5':
+  '@changesets/apply-release-plan@7.0.6':
    dependencies:
-      '@changesets/config': 3.0.3
+      '@changesets/config': 3.0.4
      '@changesets/get-version-range-type': 0.4.0
-      '@changesets/git': 3.0.1
+      '@changesets/git': 3.0.2
      '@changesets/should-skip-package': 0.1.1
      '@changesets/types': 6.0.0
      '@manypkg/get-packages': 1.1.3
@ -11896,7 +11872,7 @@ snapshots:
      resolve-from: 5.0.0
      semver: 7.6.3

-  '@changesets/assemble-release-plan@6.0.4':
+  '@changesets/assemble-release-plan@6.0.5':
    dependencies:
      '@changesets/errors': 0.2.0
      '@changesets/get-dependents-graph': 2.1.2
@ -11917,19 +11893,19 @@ snapshots:
    transitivePeerDependencies:
      - encoding

-  '@changesets/cli@2.27.9':
+  '@changesets/cli@2.27.10':
    dependencies:
-      '@changesets/apply-release-plan': 7.0.5
-      '@changesets/assemble-release-plan': 6.0.4
+      '@changesets/apply-release-plan': 7.0.6
+      '@changesets/assemble-release-plan': 6.0.5
      '@changesets/changelog-git': 0.2.0
-      '@changesets/config': 3.0.3
+      '@changesets/config': 3.0.4
      '@changesets/errors': 0.2.0
      '@changesets/get-dependents-graph': 2.1.2
-      '@changesets/get-release-plan': 4.0.4
-      '@changesets/git': 3.0.1
+      '@changesets/get-release-plan': 4.0.5
+      '@changesets/git': 3.0.2
      '@changesets/logger': 0.1.1
      '@changesets/pre': 2.0.1
-      '@changesets/read': 0.6.1
+      '@changesets/read': 0.6.2
      '@changesets/should-skip-package': 0.1.1
      '@changesets/types': 6.0.0
      '@changesets/write': 0.3.2
@ -11942,13 +11918,13 @@ snapshots:
      mri: 1.2.0
      p-limit: 2.3.0
      package-manager-detector: 0.2.0
-      picocolors: 1.1.0
+      picocolors: 1.1.1
      resolve-from: 5.0.0
      semver: 7.6.3
-      spawndamnit: 2.0.0
+      spawndamnit: 3.0.1
      term-size: 2.2.1

-  '@changesets/config@3.0.3':
+  '@changesets/config@3.0.4':
    dependencies:
      '@changesets/errors': 0.2.0
      '@changesets/get-dependents-graph': 2.1.2
@ -11966,7 +11942,7 @@ snapshots:
    dependencies:
      '@changesets/types': 6.0.0
      '@manypkg/get-packages': 1.1.3
-      picocolors: 1.1.0
+      picocolors: 1.1.1
      semver: 7.6.3

  '@changesets/get-github-info@0.6.0':
@ -11976,28 +11952,28 @@ snapshots:
    transitivePeerDependencies:
      - encoding

-  '@changesets/get-release-plan@4.0.4':
+  '@changesets/get-release-plan@4.0.5':
    dependencies:
-      '@changesets/assemble-release-plan': 6.0.4
-      '@changesets/config': 3.0.3
+      '@changesets/assemble-release-plan': 6.0.5
+      '@changesets/config': 3.0.4
      '@changesets/pre': 2.0.1
-      '@changesets/read': 0.6.1
+      '@changesets/read': 0.6.2
      '@changesets/types': 6.0.0
      '@manypkg/get-packages': 1.1.3

  '@changesets/get-version-range-type@0.4.0': {}

-  '@changesets/git@3.0.1':
+  '@changesets/git@3.0.2':
    dependencies:
      '@changesets/errors': 0.2.0
      '@manypkg/get-packages': 1.1.3
      is-subdir: 1.2.0
      micromatch: 4.0.8
-      spawndamnit: 2.0.0
+      spawndamnit: 3.0.1

  '@changesets/logger@0.1.1':
    dependencies:
-      picocolors: 1.1.0
+      picocolors: 1.1.1

  '@changesets/parse@0.4.0':
    dependencies:
@ -12011,15 +11987,15 @@ snapshots:
      '@manypkg/get-packages': 1.1.3
      fs-extra: 7.0.1

-  '@changesets/read@0.6.1':
+  '@changesets/read@0.6.2':
    dependencies:
-      '@changesets/git': 3.0.1
+      '@changesets/git': 3.0.2
      '@changesets/logger': 0.1.1
      '@changesets/parse': 0.4.0
      '@changesets/types': 6.0.0
      fs-extra: 7.0.1
      p-filter: 2.1.0
-      picocolors: 1.1.0
+      picocolors: 1.1.1

  '@changesets/should-skip-package@0.1.1':
    dependencies:
@ -13986,12 +13962,6 @@ snapshots:

  cross-argv@2.0.0: {}

-  cross-spawn@5.1.0:
-    dependencies:
-      lru-cache: 4.1.5
-      shebang-command: 1.2.0
-      which: 1.3.1
-
  cross-spawn@7.0.3:
    dependencies:
      path-key: 3.1.1
@ -15201,11 +15171,6 @@ snapshots:

  lru-cache@10.4.3: {}

-  lru-cache@4.1.5:
-    dependencies:
-      pseudomap: 1.0.2
-      yallist: 2.1.2
-
  lru-cache@5.1.1:
    dependencies:
      yallist: 3.1.1
@ -16397,8 +16362,6 @@ snapshots:

  proxy-from-env@1.1.0: {}

-  pseudomap@1.0.2: {}
-
  psl@1.9.0: {}

  publint@0.2.12:
@ -16873,16 +16836,10 @@ snapshots:
      '@img/sharp-win32-ia32': 0.33.3
      '@img/sharp-win32-x64': 0.33.3

-  shebang-command@1.2.0:
-    dependencies:
-      shebang-regex: 1.0.0
-
  shebang-command@2.0.0:
    dependencies:
      shebang-regex: 3.0.0

-  shebang-regex@1.0.0: {}
-
  shebang-regex@3.0.0: {}

  shiki-twoslash@3.1.2(typescript@5.6.3):
@ -16984,10 +16941,10 @@ snapshots:

  space-separated-tokens@2.0.2: {}

-  spawndamnit@2.0.0:
+  spawndamnit@3.0.1:
    dependencies:
-      cross-spawn: 5.1.0
-      signal-exit: 3.0.7
+      cross-spawn: 7.0.6
+      signal-exit: 4.1.0

  speakingurl@14.0.1: {}

@ -17830,10 +17787,6 @@ snapshots:
    dependencies:
      load-yaml-file: 0.2.0

-  which@1.3.1:
-    dependencies:
-      isexe: 2.0.0
-
  which@2.0.2:
    dependencies:
      isexe: 2.0.0
@ -17890,8 +17843,6 @@ snapshots:

  y18n@5.0.8: {}

-  yallist@2.1.2: {}
-
  yallist@3.1.1: {}

  yallist@4.0.0: {}