update to astro 6 (#221)

Co-authored-by: Pedro <3602279+Doc94@users.noreply.github.com>
Co-authored-by: mja00 <me@mja00.dev>
Co-authored-by: Strokkur24 <strokkur.24@gmail.com>

Author: 4 people

.gitattributes

@@ -0,0 +1,8 @@
+# Documentation: https://www.git-scm.com/docs/gitattributes
+
+# Set default behavior to automatically normalize line endings.
+* text=auto eol=lf
+
+# Enforce CRLF line endings in Windows batch scripts to avoid issues.
+*.cmd text eol=crlf
+*.bat text eol=crlf

.github/workflows/check.yaml

@@ -7,18 +7,19 @@ on:
 
 jobs:
   lint:
-    # Only run on PRs if the source branch is on someone else's repo
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
 
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
 
       - name: Install dependencies
         run: bun install

AGENTS.md

@@ -1 +1 @@
-README.md
+README.md

README.md

@@ -1,6 +1,6 @@
 # papermc.io [![Discord](https://img.shields.io/discord/289587909051416579.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/papermc) ![License](https://img.shields.io/github/license/PaperMC/website)
 
-The official [PaperMC](https://papermc.io) website — built with **Astro 5**, powered by **Bun**, and styled using **Tailwind CSS v4**. Content in this repository is published to [papermc.io](https://papermc.io) for viewing.
+The official [PaperMC](https://papermc.io) website — built with **Astro 6**, powered by **Bun**, and styled using **Tailwind CSS v4**. Content in this repository is published to [papermc.io](https://papermc.io) for viewing.
 
 ---
 
@@ -10,6 +10,7 @@ How to get the project running on your local machine for development.
 
 ### Prerequisites
 
+- [Node 24](https://nodejs.org)
 - [Bun](https://bun.com/)
 
 ### Local Development
@@ -63,13 +64,13 @@ website/
 ├─ public/           # Static assets (favicon, icons, etc.)
 ├─ astro.config.mjs  # Astro configuration
 ├─ tailwind.config.ts
-├─ bun.lockb
+├─ bun.lock
 └─ package.json
 ```
 
 ## 💡 Development Notes
 
-This project uses Astro 5, which introduces faster rebuilds, partial hydration improvements, and first-class hybrid rendering.
+This project uses Astro 6, which introduces faster rebuilds, partial hydration improvements, and first-class hybrid rendering.
 
 Svelte is used for dynamic islands and component interactivity.
 
@@ -81,7 +82,7 @@ Pages are statically generated by default, with selective SSR where necessary.
 
 ## 📚 Learn More
 
-🌌 [Astro 5 Documentation](https://docs.astro.build)
+🌌 [Astro 6 Documentation](https://docs.astro.build)
 
 🎨 [Tailwind CSS v4 Docs](https://tailwindcss.com/docs)
 

astro.config.mjs

@@ -44,12 +44,7 @@ export default defineConfig({
   ],
 
   adapter: cloudflare({
-    platformProxy: {
-      enabled: true,
-      persist: true,
-    },
-    workerEntryPoint: {
-      path: "src/worker.ts",
-    },
+    prerenderEnvironment: "node",
+    imageService: "compile",
   }),
 });

bun.lock

@@ -1,6 +1,6 @@
 [run]
 # equivalent to `bun --bun` for all `bun run` commands
-bun = true
+bun = false
 
 [install]
 # Only install package versions published at least 3 days ago

bunfig.toml

@@ -7,46 +7,53 @@
     "build": "astro build",
     "preview": "astro preview",
     "astro": "astro",
-    "format": "prettier --write .",
+    "format": "prettier --write --list-different .",
     "lint:eslint": "eslint . --cache",
     "lint:prettier": "prettier --check .",
-    "check:types": "astro sync && tsgo --noEmit",
+    "check:types": "wrangler types && astro sync && tsgo --noEmit",
     "lint": "bun run lint:eslint && bun run lint:prettier",
     "check": "bun run check:types",
-    "check:all": "bun run check && bun run lint"
+    "check:all": "bun run check && bun run lint",
+    "postinstall": "wrangler types"
   },
   "dependencies": {
-    "@astrojs/cloudflare": "^12.6.10",
-    "@astrojs/rss": "^4.0.13",
-    "@astrojs/sitemap": "^3.6.0",
-    "@astrojs/svelte": "^7.2.1",
-    "@fontsource/poppins": "^5.2.7",
-    "@tailwindcss/vite": "^4.1.16",
-    "astro": "5.15.1",
-    "astro-icon": "^1.1.5",
-    "clsx": "^2.1.1",
-    "remove-markdown": "^0.6.2",
-    "runed": "^0.35.1",
-    "svelte": "^5.42.3",
-    "tailwindcss": "^4.1.16",
-    "typescript": "^5.9.3"
+    "@astrojs/cloudflare": "13.1.7",
+    "@astrojs/rss": "4.0.18",
+    "@astrojs/sitemap": "3.7.2",
+    "@astrojs/svelte": "8.0.4",
+    "@fontsource/poppins": "5.2.7",
+    "@tailwindcss/vite": "4.2.2",
+    "astro": "6.1.3",
+    "astro-icon": "1.1.5",
+    "clsx": "2.1.1",
+    "remove-markdown": "0.6.3",
+    "runed": "0.37.1",
+    "svelte": "5.55.1",
+    "tailwindcss": "4.2.2",
+    "typescript": "6.0.2"
   },
   "devDependencies": {
-    "@astrojs/mdx": "^4.3.9",
-    "@tailwindcss/typography": "^0.5.19",
-    "@types/node": "^24.9.2",
-    "@typescript-eslint/eslint-plugin": "^8.46.2",
-    "@typescript-eslint/parser": "^8.46.2",
-    "@typescript/native-preview": "^7.0.0-dev.20251027.1",
-    "eslint": "^9.38.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-astro": "^1.4.0",
-    "eslint-plugin-svelte": "^3.12.5",
-    "prettier": "^3.6.2",
-    "prettier-plugin-astro": "^0.14.1",
-    "prettier-plugin-svelte": "^3.4.0",
-    "prettier-plugin-tailwindcss": "^0.7.1",
-    "svelte-eslint-parser": "^1.4.0",
-    "wrangler": "^4.45.0"
+    "@astrojs/mdx": "5.0.3",
+    "@tailwindcss/typography": "0.5.19",
+    "@types/node": "25.5.0",
+    "@typescript-eslint/eslint-plugin": "8.58.0",
+    "@typescript-eslint/parser": "8.58.0",
+    "@typescript/native-preview": "7.0.0-dev.20260401.1",
+    "eslint": "10.1.0",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-astro": "1.6.0",
+    "eslint-plugin-svelte": "3.16.0",
+    "prettier": "3.8.1",
+    "prettier-plugin-astro": "0.14.1",
+    "prettier-plugin-svelte": "3.5.1",
+    "prettier-plugin-tailwindcss": "0.7.2",
+    "svelte-eslint-parser": "1.6.0",
+    "wrangler": "4.80.0"
+  },
+  "devEngines": {
+    "runtime": {
+      "name": "node",
+      "version": ">=22.x"
+    }
   }
 }

package.json

@@ -1,29 +1,27 @@
 ---
 import { getImage, imageConfig, type LocalImageProps, type RemoteImageProps } from "astro:assets";
-import type { UnresolvedImageTransform } from "node_modules/astro/dist/assets/types";
 import type { HTMLAttributes } from "astro/types";
-import "node_modules/astro/components/image.css";
 
 import fallbackImage from "@/assets/brand/paper.svg";
-import { AstroError } from "node_modules/astro/dist/core/errors/errors";
-import { AstroErrorData } from "node_modules/astro/dist/core/errors";
 import { inferRemoteSize } from "astro/assets/utils";
 
 type Props = LocalImageProps | RemoteImageProps;
 
 const props = Astro.props;
 
 if (props.alt === undefined || props.alt === null) {
-  throw new AstroError(AstroErrorData.ImageMissingAlt);
+  throw new Error("Image is missing required 'alt' property.");
 }
 
-if (typeof props.width === "string") {
-  props.width = parseInt(props.width);
+function toOptionalNumber(value: number | `${number}` | undefined): number | undefined {
+  if (value === undefined) return undefined;
+  return typeof value === "string" ? Number.parseInt(value, 10) : value;
 }
 
-if (typeof props.height === "string") {
-  props.height = parseInt(props.height);
-}
+const width = toOptionalNumber(props.width);
+const height = toOptionalNumber(props.height);
+props.width = width;
+props.height = height;
 
 const additionalAttributes: HTMLAttributes<"img"> = {};
 try {
@@ -41,7 +39,8 @@ if (layout !== "none") {
   props.position ??= imageConfig.objectPosition ?? "center";
 }
 
-const image = await getImage(props as UnresolvedImageTransform);
+// getImage has a weird type signature, so this will cast it properly to the correct type
+const image = await getImage({ ...props, width, height });
 
 if (image.srcSet.values.length > 0) {
   additionalAttributes.srcset = image.srcSet.attribute;

src/components/data/RemoteImageWrapper.astro

@@ -5,8 +5,6 @@ import RemoteImageWrapper from "@/components/data/RemoteImageWrapper.astro";
 type Props = LocalImageProps | RemoteImageProps;
 
 const { class: className, ...props } = Astro.props;
-
-import "node_modules/astro/components/image.css";
 ---
 
 {/* Applying class outside of the spread prevents it from applying unnecessary astro-* classes */}