Skip to content

Commit a0424b6

Browse files
matthewpmatthewp
committed
Merge branch 'main' into netlify-skew-protection
2 parents aa361ef + 63b2568 commit a0424b6

87 files changed

Lines changed: 1617 additions & 662 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/easy-chicken-prove.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/fix-vercel-densities.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@astrojs/vercel": patch
3+
---
4+
5+
Fix regression in 8.2.7: validate densities-based srcset widths against configured sizes
6+
7+
When using `densities` with the Vercel image adapter, calculated widths were not being validated against Vercel's configured sizes list. This caused images to fail when using densities, as Vercel would reject the invalid widths.
8+
9+
This fix ensures densities-calculated widths are mapped to valid configured sizes, matching the behavior already implemented for the `widths` prop.

‎.changeset/neat-images-resolve.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Fixes image path resolution in content layer collections to support bare filenames. The `image()` helper now normalizes bare filenames like `"cover.jpg"` to relative paths `"./cover.jpg"` for consistent resolution behavior between markdown frontmatter and JSON content collections.

‎.changeset/plain-women-double.md‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.changeset/tasty-snails-smile.md‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎.github/renovate.json5‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@
8282
"pnpm",
8383
// follow vite deps version
8484
"postcss-load-config",
85-
"esbuild",
86-
// TODO: fix upstream
87-
// https://github.com/vercel/nft/issues/545
88-
"@vercel/nft"
85+
"esbuild"
8986
],
9087
"minimumReleaseAge": "3 days"
9188
}

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Node
3636
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
3737
with:
38-
node-version: 22
38+
node-version: 24
3939
cache: "pnpm"
4040

4141
- name: Install dependencies
@@ -56,8 +56,8 @@ jobs:
5656
env:
5757
# Needs access to push to main
5858
GITHUB_TOKEN: ${{ secrets.FREDKBOT_GITHUB_TOKEN }}
59-
# Needs access to publish to npm
60-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
59+
# Use OIDC for npm authentication instead of NPM_TOKEN
60+
NPM_TOKEN: '' # https://github.com/changesets/changesets/issues/1152#issuecomment-3190884868
6161

6262
- name: Generate Announcement
6363
id: message

‎examples/basics/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"astro": "^5.14.5"
13+
"astro": "^5.14.7"
1414
}
1515
}

‎examples/blog/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@astrojs/mdx": "^4.3.7",
1414
"@astrojs/rss": "^4.0.12",
1515
"@astrojs/sitemap": "^3.6.0",
16-
"astro": "^5.14.5",
16+
"astro": "^5.14.7",
1717
"sharp": "^0.34.3"
1818
}
1919
}

‎examples/component/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"scripts": {},
1717
"devDependencies": {
18-
"astro": "^5.14.5"
18+
"astro": "^5.14.7"
1919
},
2020
"peerDependencies": {
2121
"astro": "^4.0.0 || ^5.0.0"

0 commit comments

Comments
 (0)