Update to Vite 8

.changeset/common-pears-drive.md

@@ -0,0 +1,17 @@
+---
+'@astrojs/cloudflare': major
+'@astrojs/alpinejs': major
+'@astrojs/markdoc': major
+'@astrojs/netlify': major
+'@astrojs/preact': major
+'@astrojs/svelte': major
+'@astrojs/vercel': major
+'@astrojs/react': major
+'@astrojs/solid-js': major
+'@astrojs/mdx': major
+'@astrojs/vue': major
+'astro': major
+'@astrojs/db': major
+---
+
+Upgrade to Vite v8

.changeset/fix-dev-port-vite-restart.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes `--port` flag being ignored after a Vite-triggered server restart (e.g. when a `.env` file changes)

.github/workflows/check-merge.yml

@@ -39,10 +39,23 @@ jobs:
         with:
           files: |
             .changeset/**/*.md
-
+      # Intentionally ran after the changed-files step so the github API is used to identify
+      # changed files rather than a local git diff, this is more reliable for pull requests
+      # originating from a forked repository.
+      - name: Checkout files
+        id: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        if: steps.changed-files.outputs.any_changed == 'true'
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          fetch-depth: 1
+          persist-credentials: false
+          sparse-checkout: |
+            .changeset
       - name: Check if any changesets contain minor or major changes
         id: check
-        if: steps.blocked.outputs.result != 'true'
+        if: steps.changed-files.outputs.any_changed == 'true'
         env:
           ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
         run: |

.github/workflows/ci.yml

@@ -332,7 +332,7 @@ jobs:
           # For a pull_request event merging into the `next` branch (`base_ref`), use the `v6` branch.
           # NOTE: For a pull_request event, the `ref_name` is something like `<pr-number>/merge` than the branch name.
           # NOTE: Perhaps docs repo should use a consistent `next` branch in the future.
-          ref: ${{ (github.ref_name == 'next' || github.base_ref == 'next') && 'v6' || 'main' }}
+          ref: ${{ (github.ref_name == 'next' || github.base_ref == 'next') && 'main' || 'main' }}
 
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile

biome.jsonc

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.2/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
   "files": {
     "includes": [
       "**",
@@ -46,7 +46,8 @@
         // Enforce separate type imports for type-only imports to avoid bundling unneeded code
         "useImportType": "error",
         "useExportType": "error",
-        "useNumberNamespace": "warn"
+        "useNumberNamespace": "warn",
+        "noInferrableTypes": "error"
       },
       "suspicious": {
         // This one is specific to catch `console.log`. The rest of logs are permitted

eslint.config.js

@@ -65,6 +65,7 @@ export default [
 			'@typescript-eslint/consistent-indexed-object-style': 'off',
 			'@typescript-eslint/consistent-type-definitions': 'off',
 			'@typescript-eslint/dot-notation': 'off',
+			'@typescript-eslint/no-inferrable-types': 'off',
 			'@typescript-eslint/no-base-to-string': 'off',
 			'@typescript-eslint/no-empty-function': 'off',
 			'@typescript-eslint/no-floating-promises': 'off',

examples/basics/package.json

@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   }
 }

examples/blog/README.md

@@ -36,6 +36,7 @@ Inside of your Astro project, you'll see the following folders and files:
 ```text
 ├── public/
 ├── src/
+│   ├── assets/
 │   ├── components/
 │   ├── content/
 │   ├── layouts/

examples/blog/astro.config.mjs

@@ -2,10 +2,34 @@
 
 import mdx from '@astrojs/mdx';
 import sitemap from '@astrojs/sitemap';
-import { defineConfig } from 'astro/config';
+import { defineConfig, fontProviders } from 'astro/config';
 
 // https://astro.build/config
 export default defineConfig({
 	site: 'https://example.com',
 	integrations: [mdx(), sitemap()],
+	fonts: [
+		{
+			provider: fontProviders.local(),
+			name: 'Atkinson',
+			cssVariable: '--font-atkinson',
+			fallbacks: ['sans-serif'],
+			options: {
+				variants: [
+					{
+						src: ['./src/assets/fonts/atkinson-regular.woff'],
+						weight: 400,
+						style: 'normal',
+						display: 'swap',
+					},
+					{
+						src: ['./src/assets/fonts/atkinson-bold.woff'],
+						weight: 700,
+						style: 'normal',
+						display: 'swap',
+					},
+				],
+			},
+		},
+	],
 });

examples/blog/package.json

@@ -16,7 +16,7 @@
     "@astrojs/mdx": "^5.0.3",
     "@astrojs/rss": "^4.0.18",
     "@astrojs/sitemap": "^3.7.2",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "sharp": "^0.34.3"
   }
 }

examples/blog/src/components/BaseHead.astro

@@ -5,6 +5,7 @@ import '../styles/global.css';
 import type { ImageMetadata } from 'astro';
 import FallbackImage from '../assets/blog-placeholder-1.jpg';
 import { SITE_TITLE } from '../consts';
+import { Font } from 'astro:assets';
 
 interface Props {
 	title: string;
@@ -31,9 +32,7 @@ const { title, description, image = FallbackImage } = Astro.props;
 />
 <meta name="generator" content={Astro.generator} />
 
-<!-- Font preloads -->
-<link rel="preload" href="/fonts/atkinson-regular.woff" as="font" type="font/woff" crossorigin />
-<link rel="preload" href="/fonts/atkinson-bold.woff" as="font" type="font/woff" crossorigin />
+<Font cssVariable="--font-atkinson" preload />
 
 <!-- Canonical URL -->
 <link rel="canonical" href={canonicalURL} />

examples/blog/src/styles/global.css

@@ -16,22 +16,8 @@
 		0 2px 6px rgba(var(--gray), 25%), 0 8px 24px rgba(var(--gray), 33%),
 		0 16px 32px rgba(var(--gray), 33%);
 }
-@font-face {
-	font-family: "Atkinson";
-	src: url("/fonts/atkinson-regular.woff") format("woff");
-	font-weight: 400;
-	font-style: normal;
-	font-display: swap;
-}
-@font-face {
-	font-family: "Atkinson";
-	src: url("/fonts/atkinson-bold.woff") format("woff");
-	font-weight: 700;
-	font-style: normal;
-	font-display: swap;
-}
 body {
-	font-family: "Atkinson", sans-serif;
+	font-family: var(--font-atkinson);
 	margin: 0;
 	padding: 0;
 	text-align: left;

examples/component/package.json

@@ -18,7 +18,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   },
   "peerDependencies": {
     "astro": "^5.0.0 || ^6.0.0"

examples/container-with-vitest/package.json

@@ -14,8 +14,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@astrojs/react": "^5.0.2",
-    "astro": "^6.1.2",
+    "@astrojs/react": "^5.0.3",
+    "astro": "^6.1.6",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vitest": "^4.1.0"

examples/framework-alpine/package.json

@@ -16,6 +16,6 @@
     "@astrojs/alpinejs": "^0.5.0",
     "@types/alpinejs": "^3.13.11",
     "alpinejs": "^3.15.8",
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   }
 }

examples/framework-multiple/package.json

@@ -13,14 +13,14 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^5.1.0",
-    "@astrojs/react": "^5.0.2",
+    "@astrojs/preact": "^5.1.1",
+    "@astrojs/react": "^5.0.3",
     "@astrojs/solid-js": "^6.0.1",
-    "@astrojs/svelte": "^8.0.4",
+    "@astrojs/svelte": "^8.0.5",
     "@astrojs/vue": "^6.0.1",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "preact": "^10.28.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

examples/framework-preact/package.json

@@ -13,9 +13,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^5.1.0",
+    "@astrojs/preact": "^5.1.1",
     "@preact/signals": "^2.8.1",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "preact": "^10.28.4"
   }
 }

examples/framework-react/package.json

@@ -13,10 +13,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^5.0.2",
+    "@astrojs/react": "^5.0.3",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }

examples/framework-solid/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^6.0.1",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "solid-js": "^1.9.11"
   }
 }

examples/framework-svelte/package.json

@@ -13,8 +13,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^8.0.4",
-    "astro": "^6.1.2",
+    "@astrojs/svelte": "^8.0.5",
+    "astro": "^6.1.6",
     "svelte": "^5.53.5"
   }
 }

examples/framework-vue/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^6.0.1",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "vue": "^3.5.29"
   }
 }

examples/hackernews/package.json

@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^10.0.4",
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   }
 }

examples/integration/package.json

@@ -18,7 +18,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/minimal/package.json

@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   }
 }

examples/portfolio/package.json

@@ -13,6 +13,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   }
 }

examples/ssr/package.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@astrojs/node": "^10.0.4",
-    "@astrojs/svelte": "^8.0.4",
-    "astro": "^6.1.2",
+    "@astrojs/svelte": "^8.0.5",
+    "astro": "^6.1.6",
     "svelte": "^5.53.5"
   }
 }

examples/starlog/package.json

@@ -9,7 +9,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "sass": "^1.97.3",
     "sharp": "^0.34.3"
   },

examples/toolbar-app/package.json

@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@types/node": "^18.17.8",
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   },
   "engines": {
     "node": ">=22.12.0"

examples/with-markdoc/package.json

@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^1.0.3",
-    "astro": "^6.1.2"
+    "astro": "^6.1.6"
   }
 }

examples/with-mdx/package.json

@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "@astrojs/mdx": "^5.0.3",
-    "@astrojs/preact": "^5.1.0",
-    "astro": "^6.1.2",
+    "@astrojs/preact": "^5.1.1",
+    "astro": "^6.1.6",
     "preact": "^10.28.4"
   }
 }

examples/with-nanostores/package.json

@@ -13,9 +13,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^5.1.0",
+    "@astrojs/preact": "^5.1.1",
     "@nanostores/preact": "^1.0.0",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "nanostores": "^1.1.1",
     "preact": "^10.28.4"
   }

examples/with-tailwindcss/package.json

@@ -16,7 +16,7 @@
     "@astrojs/mdx": "^5.0.3",
     "@tailwindcss/vite": "^4.2.1",
     "@types/canvas-confetti": "^1.9.0",
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "canvas-confetti": "^1.9.4",
     "tailwindcss": "^4.2.1"
   }

examples/with-vitest/package.json

@@ -14,7 +14,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^6.1.2",
+    "astro": "^6.1.6",
     "vitest": "^4.1.0"
   }
 }