[pull] main from withastro:main

.changeset/vercel-gitignore.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Add `.vercel` to `.gitignore` when adding the Vercel adapter via `astro add vercel`

examples/basics/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   }
 }

examples/blog/package.json

@@ -13,7 +13,7 @@
     "@astrojs/mdx": "^4.3.13",
     "@astrojs/rss": "^4.0.15",
     "@astrojs/sitemap": "^3.7.0",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "sharp": "^0.34.3"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"

examples/container-with-vitest/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/react": "^4.4.2",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vitest": "^3.2.4"

examples/framework-alpine/package.json

@@ -13,6 +13,6 @@
     "@astrojs/alpinejs": "^0.4.9",
     "@types/alpinejs": "^3.13.11",
     "alpinejs": "^3.15.4",
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   }
 }

examples/framework-multiple/package.json

@@ -17,7 +17,7 @@
     "@astrojs/vue": "^5.1.4",
     "@types/react": "^18.3.27",
     "@types/react-dom": "^18.3.7",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "preact": "^10.28.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

examples/framework-preact/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@astrojs/preact": "^4.1.3",
     "@preact/signals": "^2.5.1",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "preact": "^10.28.2"
   }
 }

examples/framework-react/package.json

@@ -13,7 +13,7 @@
     "@astrojs/react": "^4.4.2",
     "@types/react": "^18.3.27",
     "@types/react-dom": "^18.3.7",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

examples/framework-solid/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^5.1.3",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "solid-js": "^1.9.10"
   }
 }

examples/framework-svelte/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^7.2.5",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "svelte": "^5.46.1"
   }
 }

examples/framework-vue/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^5.1.4",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "vue": "^3.5.26"
   }
 }

examples/hackernews/package.json

@@ -11,6 +11,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^9.5.2",
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   }
 }

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/minimal/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   }
 }

examples/portfolio/package.json

@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   }
 }

examples/ssr/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/node": "^9.5.2",
     "@astrojs/svelte": "^7.2.5",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "svelte": "^5.46.1"
   }
 }

examples/starlog/package.json

@@ -9,7 +9,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "sass": "^1.97.2",
     "sharp": "^0.34.3"
   }

examples/toolbar-app/package.json

@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/node": "^18.17.8",
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   }
 }

examples/with-markdoc/package.json

@@ -11,6 +11,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.15.10",
-    "astro": "^5.16.12"
+    "astro": "^5.16.13"
   }
 }

examples/with-mdx/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@astrojs/mdx": "^4.3.13",
     "@astrojs/preact": "^4.1.3",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "preact": "^10.28.2"
   }
 }

examples/with-nanostores/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@astrojs/preact": "^4.1.3",
     "@nanostores/preact": "^0.5.2",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "nanostores": "^0.11.4",
     "preact": "^10.28.2"
   }

examples/with-tailwindcss/package.json

@@ -13,7 +13,7 @@
     "@astrojs/mdx": "^4.3.13",
     "@tailwindcss/vite": "^4.1.18",
     "@types/canvas-confetti": "^1.9.0",
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "canvas-confetti": "^1.9.4",
     "tailwindcss": "^4.1.18"
   }

examples/with-vitest/package.json

@@ -11,7 +11,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^5.16.12",
+    "astro": "^5.16.13",
     "vitest": "^3.2.4"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,51 @@
 # astro
 
+## 5.16.13
+
+### Patch Changes
+
+- [#15182](https://github.com/withastro/astro/pull/15182) [`cb60ee1`](https://github.com/withastro/astro/commit/cb60ee16051da258ab140f3bb64ff3fd8e4c9e17) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Adds a new `getFontBuffer()` method to retrieve font file buffers when using the experimental Fonts API
+
+  The `getFontData()` helper function from `astro:assets` was introduced in 5.14.0 to provide access to font family data for use outside of Astro. One of the goals of this API was to be able to retrieve buffers using URLs.
+
+  However, it turned out to be impactical and even impossible during prerendering.
+
+  Astro now exports a new `getFontBuffer()` helper function from `astro:assets` to retrieve font file buffers from URL returned by `getFontData()`. For example, when using [satori](https://github.com/vercel/satori) to generate OpenGraph images:
+
+  ```diff
+  // src/pages/og.png.ts
+
+  import type{ APIRoute } from "astro"
+  -import { getFontData } from "astro:assets"
+  +import { getFontData, getFontBuffer } from "astro:assets"
+  import satori from "satori"
+
+  export const GET: APIRoute = (context) => {
+    const data = getFontData("--font-roboto")
+
+    const svg = await satori(
+      <div style={{ color: "black" }}>hello, world</div>,
+      {
+        width: 600,
+        height: 400,
+        fonts: [
+          {
+            name: "Roboto",
+  -          data: await fetch(new URL(data[0].src[0].url, context.url.origin)).then(res => res.arrayBuffer()),
+  +          data: await getFontBuffer(data[0].src[0].url),
+            weight: 400,
+            style: "normal",
+          },
+        ],
+      },
+    )
+
+    // ...
+  }
+  ```
+
+  See the [experimental Fonts API documentation](https://docs.astro.build/en/reference/experimental-flags/fonts/#accessing-font-data-programmatically) for more information.
+
 ## 5.16.12
 
 ### Patch Changes

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.16.12",
+  "version": "5.16.13",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

packages/astro/src/cli/add/index.ts

@@ -325,6 +325,43 @@ export async function add(names: string[], { flags }: AddOptions) {
 					defaultConfigContent: STUBS.LIT_NPMRC,
 				});
 			}
+			// The Vercel adapter outputs to .vercel/output which should be gitignored
+			if (integrations.find((integration) => integration.id === 'vercel')) {
+				const gitignorePath = new URL('./.gitignore', root);
+				const gitignoreEntry = '.vercel';
+
+				if (existsSync(gitignorePath)) {
+					const content = await fs.readFile(fileURLToPath(gitignorePath), { encoding: 'utf-8' });
+					if (!content.includes(gitignoreEntry)) {
+						logger.info(
+							'SKIP_FORMAT',
+							`\n  ${magenta(`Astro will add ${green('.vercel')} to ${green('.gitignore')}.`)}\n`,
+						);
+
+						if (await askToContinue({ flags, logger })) {
+							const newContent = content.endsWith('\n')
+								? `${content}${gitignoreEntry}\n`
+								: `${content}\n${gitignoreEntry}\n`;
+							await fs.writeFile(fileURLToPath(gitignorePath), newContent, { encoding: 'utf-8' });
+							logger.debug('add', 'Updated .gitignore with .vercel');
+						}
+					} else {
+						logger.debug('add', '.vercel already in .gitignore');
+					}
+				} else {
+					logger.info(
+						'SKIP_FORMAT',
+						`\n  ${magenta(`Astro will create ${green('.gitignore')} with ${green('.vercel')}.`)}\n`,
+					);
+
+					if (await askToContinue({ flags, logger })) {
+						await fs.writeFile(fileURLToPath(gitignorePath), `${gitignoreEntry}\n`, {
+							encoding: 'utf-8',
+						});
+						logger.debug('add', 'Created .gitignore with .vercel');
+					}
+				}
+			}
 			break;
 		}
 		case UpdateResult.cancelled: {