From 9b5d38cfe57099f53ffa7b6500c89a07783da7c5 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 2 Sep 2026 18:55:07 +0000 Subject: [PATCH 1/2] chore(deps): update Astro packages to latest across landing and docs Consolidates the open dependabot Astro PRs (#3458, #3509, #3510, #3511, #3513) into a single coordinated upgrade from Astro 5 to Astro 7: - astro 5.18.2 -> 7.2.10 (both apps) - @astrojs/mdx 5.0.6 -> 8.0.0 - @astrojs/vercel 9.0.5 -> 11.0.9 - @astrojs/starlight 0.37.7 -> 0.42.0 - @astrojs/sitemap 3.7.3 -> 3.7.4 - starlight-typedoc 0.21.5 -> 0.23.1 - sharp 0.34.5 -> 0.35.x (matches existing workspace override) Code changes for the Astro 6/7 breaking changes: - Migrate legacy content collections (removed in Astro 6) to the Content Layer API: src/content/config.ts moves to src/content.config.ts with the glob() loader in landing and Starlight's docsLoader() in docs, and entry.slug / entry.render() become entry.id / render(entry). - Replace the removed component with . - Drop the deprecated @astrojs/starlight/props Props import from the Starlight Head override. - Accept the Astro 6 endpoint trailing-slash change in the Vercel route assertions (/index.md route no longer matches a trailing slash). - Keep the landing e2e dev server in the foreground: Astro 7 detaches `astro dev` into a background daemon when it detects an AI coding agent (opted out via ASTRO_DEV_BACKGROUND), and strip Vitest's VITEST env marker, which makes the Vite 8 dev server 404 every route. - Raise Node to >= 22.12 (Astro 7 minimum) in the workspace engines and the docs Dockerfile, and align the Dockerfile's pnpm with the workspace's packageManager version. Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01KB5E2kb34UW1yqBNuEjgpF --- docs-src/Dockerfile | 4 +- docs-src/package.json | 8 +- docs-src/src/components/HeadWithPosthog.astro | 3 +- .../{content/config.ts => content.config.ts} | 3 +- landing/package.json | 10 +- landing/src/components/BaseHead.astro | 4 +- .../{content/config.ts => content.config.ts} | 5 +- landing/src/pages/blog/[...slug].astro | 6 +- landing/src/pages/blog/index.astro | 2 +- landing/src/pages/rss.xml.js | 2 +- landing/test/dist.test.ts | 4 +- landing/test/setup/dev-server.ts | 11 +- package.json | 2 +- pnpm-lock.yaml | 2894 ++++++----------- pnpm-workspace.yaml | 3 + 15 files changed, 984 insertions(+), 1977 deletions(-) rename docs-src/src/{content/config.ts => content.config.ts} (51%) rename landing/src/{content/config.ts => content.config.ts} (68%) diff --git a/docs-src/Dockerfile b/docs-src/Dockerfile index 582c979f0..40f724ce8 100644 --- a/docs-src/Dockerfile +++ b/docs-src/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Adjust NODE_VERSION as desired -ARG NODE_VERSION=20.10.0 +ARG NODE_VERSION=22.22.2 FROM node:${NODE_VERSION}-slim as base LABEL fly_launch_runtime="Astro" @@ -13,7 +13,7 @@ WORKDIR /app ENV NODE_ENV="production" # Install pnpm -ARG PNPM_VERSION=9.2.0 +ARG PNPM_VERSION=11.21.0 RUN npm install -g pnpm@$PNPM_VERSION diff --git a/docs-src/package.json b/docs-src/package.json index c51122750..40ddee873 100644 --- a/docs-src/package.json +++ b/docs-src/package.json @@ -11,15 +11,15 @@ "astro": "astro" }, "dependencies": { - "@astrojs/starlight": "^0.37.7", - "astro": "^5.18.2", + "@astrojs/starlight": "^0.42.0", + "astro": "^7.2.10", "shepherd.js": "workspace:*", - "starlight-typedoc": "^0.21.5" + "starlight-typedoc": "^0.23.1" }, "devDependencies": { "@astrojs/check": "^0.9.10", "@flydotio/dockerfile": "^0.7.10", - "sharp": "^0.34.5", + "sharp": "^0.35.0", "typedoc": "^0.28.20", "typedoc-plugin-markdown": "^4.12.0", "typescript": "^5.9.3" diff --git a/docs-src/src/components/HeadWithPosthog.astro b/docs-src/src/components/HeadWithPosthog.astro index c7c12f49a..09fc10573 100644 --- a/docs-src/src/components/HeadWithPosthog.astro +++ b/docs-src/src/components/HeadWithPosthog.astro @@ -1,8 +1,7 @@ --- -import type { Props } from '@astrojs/starlight/props'; import Default from '@astrojs/starlight/components/Head.astro'; import PostHog from './Posthog.astro'; --- - + diff --git a/docs-src/src/content/config.ts b/docs-src/src/content.config.ts similarity index 51% rename from docs-src/src/content/config.ts rename to docs-src/src/content.config.ts index 45f60b015..d9ee8c9d1 100644 --- a/docs-src/src/content/config.ts +++ b/docs-src/src/content.config.ts @@ -1,6 +1,7 @@ import { defineCollection } from 'astro:content'; +import { docsLoader } from '@astrojs/starlight/loaders'; import { docsSchema } from '@astrojs/starlight/schema'; export const collections = { - docs: defineCollection({ schema: docsSchema() }), + docs: defineCollection({ loader: docsLoader(), schema: docsSchema() }), }; diff --git a/landing/package.json b/landing/package.json index 5243ddba9..2fd27411d 100644 --- a/landing/package.json +++ b/landing/package.json @@ -13,19 +13,19 @@ "test:watch": "vitest" }, "dependencies": { - "@astrojs/mdx": "^5.0.6", - "@astrojs/vercel": "^9.0.5", + "@astrojs/mdx": "^8.0.0", + "@astrojs/vercel": "^11.0.9", "@polar-sh/astro": "^0.7.6", - "astro": "^5.18.2", + "astro": "^7.2.10", "shepherd.js": "workspace:*" }, "devDependencies": { "@astrojs/check": "^0.9.10", "@astrojs/rss": "^4.0.19", - "@astrojs/sitemap": "^3.7.3", + "@astrojs/sitemap": "^3.7.4", "@tailwindcss/typography": "^0.5.20", "@tailwindcss/vite": "^4.3.3", - "sharp": "^0.34.5", + "sharp": "^0.35.0", "tailwindcss": "^4.3.3", "typescript": "^5.9.3", "vite": "^8.2.1", diff --git a/landing/src/components/BaseHead.astro b/landing/src/components/BaseHead.astro index eacb470bc..0f2e1f4af 100644 --- a/landing/src/components/BaseHead.astro +++ b/landing/src/components/BaseHead.astro @@ -1,5 +1,5 @@ --- -import { ViewTransitions } from 'astro:transitions'; +import { ClientRouter } from 'astro:transitions'; import PostHog from './Posthog.astro'; // Import the global.css file here so that it is included on @@ -190,4 +190,4 @@ const structuredData = {