Merge branch 'main' of https://github.com/withastro/astro into render…

…-to-string-async-solid

.changeset/great-beans-check.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes error overlay display on URI malformed error

.changeset/ninety-buses-occur.md

@@ -0,0 +1,5 @@
+---
+"@astrojs/vue": patch
+---
+
+Fixes support for async `appEntrypoint`

.changeset/olive-sloths-brush.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/node': patch
+---
+
+Fixes a bug where an error while serving response stopped the server.

.changeset/quiet-weeks-teach.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Prevents ANSI codes from rendering in the error overlay

.changeset/silent-wasps-learn.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Toggle dev toolbar hitbox height when toolbar is visible

.changeset/small-snakes-build.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes remote images with encoded characters

.changeset/weak-oranges-relate.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+`<Image />` srcset now parses encoded paths correctly

.changeset/yellow-yaks-promise.md

@@ -0,0 +1,5 @@
+---
+"@astrojs/vercel": patch
+---
+
+Fixes an issue where a build could not complete on Node 21.

.github/workflows/ci.yml

@@ -237,7 +237,7 @@ jobs:
 
       - name: Build autogenerated docs pages from current astro branch
         if: ${{ steps.changes.outputs.docs == 'true' }}
-        run: cd smoke/docs && pnpm docgen && pnpm docgen:errors && pnpm docgen:integrations
+        run: cd smoke/docs && pnpm docgen && pnpm docgen:errors
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SOURCE_REPO: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}

README.md

@@ -1,4 +1,4 @@
-![Build the web you want](.github/assets/banner.png 'Build the web you want')
+![Build the web you want](.github/assets/banner.jpg 'Build the web you want')
 
 <p align="center">
   <br/>

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.5"
+    "astro": "^4.0.8"
   }
 }

examples/blog/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.1",
+    "@astrojs/mdx": "^2.0.3",
     "@astrojs/rss": "^4.0.1",
-    "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.5"
+    "@astrojs/sitemap": "^3.0.4",
+    "astro": "^4.0.8"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.5"
+    "astro": "^4.0.8"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

examples/framework-alpine/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/alpinejs": "^0.3.1",
+    "@astrojs/alpinejs": "^0.3.2",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.5"
+    "astro": "^4.0.8"
   }
 }

examples/framework-lit/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/lit": "^4.0.0",
+    "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.5",
+    "astro": "^4.0.8",
     "lit": "^2.8.0"
   }
 }

examples/framework-multiple/package.json

@@ -11,12 +11,12 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.0.1",
-    "@astrojs/react": "^3.0.7",
-    "@astrojs/solid-js": "^3.0.2",
-    "@astrojs/svelte": "^5.0.1",
-    "@astrojs/vue": "^4.0.3",
-    "astro": "^4.0.5",
+    "@astrojs/preact": "^3.0.2",
+    "@astrojs/react": "^3.0.9",
+    "@astrojs/solid-js": "^3.0.3",
+    "@astrojs/svelte": "^5.0.3",
+    "@astrojs/vue": "^4.0.6",
+    "astro": "^4.0.8",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/framework-preact/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.0.1",
+    "@astrojs/preact": "^3.0.2",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.5",
+    "astro": "^4.0.8",
     "preact": "^10.19.2"
   }
 }

examples/framework-react/package.json

@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^3.0.7",
+    "@astrojs/react": "^3.0.9",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.5",
+    "astro": "^4.0.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.5",
+    "@astrojs/solid-js": "^3.0.3",
+    "astro": "^4.0.8",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^5.0.1",
-    "astro": "^4.0.5",
+    "@astrojs/svelte": "^5.0.3",
+    "astro": "^4.0.8",
     "svelte": "^4.2.5"
   }
 }

examples/framework-vue/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^4.0.3",
-    "astro": "^4.0.5",
+    "@astrojs/vue": "^4.0.6",
+    "astro": "^4.0.8",
     "vue": "^3.3.8"
   }
 }

examples/hackernews/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.1",
-    "astro": "^4.0.5"
+    "@astrojs/node": "^7.0.3",
+    "astro": "^4.0.8"
   }
 }

examples/integration/index.ts

@@ -10,11 +10,11 @@ export default function createIntegration(): AstroIntegration {
 				// See the @astrojs/react integration for an example
 				// https://github.com/withastro/astro/blob/main/packages/integrations/react/src/index.ts
 			},
-			'astro:build:setup': ({ pages, updateConfig }) => {
+			'astro:build:setup': () => {
 				// See the @astrojs/lit integration for an example
 				// https://github.com/withastro/astro/blob/main/packages/integrations/lit/src/index.ts
 			},
-			'astro:build:done': ({ dir, routes }) => {
+			'astro:build:done': () => {
 				// See the @astrojs/partytown integration for an example
 				// https://github.com/withastro/astro/blob/main/packages/integrations/partytown/src/index.ts
 			},

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.5"
+    "astro": "^4.0.8"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

examples/middleware/package.json

@@ -12,8 +12,11 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.1",
-    "astro": "^4.0.5",
+    "@astrojs/node": "^7.0.3",
+    "astro": "^4.0.8",
     "html-minifier": "^4.0.0"
+  },
+  "devDependencies": {
+    "@types/html-minifier": "^4.0.5"
   }
 }

examples/middleware/src/middleware.ts

@@ -3,12 +3,15 @@ import htmlMinifier from 'html-minifier';
 
 const limit = 50;
 
-const loginInfo = {
+const loginInfo: {
+	token: undefined | string;
+	currentTime: undefined | number;
+} = {
 	token: undefined,
 	currentTime: undefined,
 };
 
-export const minifier = defineMiddleware(async (context, next) => {
+export const minifier = defineMiddleware(async (_context, next) => {
 	const response = await next();
 	// check if the response is returning some HTML
 	if (response.headers.get('content-type') === 'text/html') {

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.5"
+    "astro": "^4.0.8"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.5"
+    "astro": "^4.0.8"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.5"
+    "astro": "^4.0.8"
   }
 }

examples/ssr/package.json

@@ -12,9 +12,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.1",
-    "@astrojs/svelte": "^5.0.1",
-    "astro": "^4.0.5",
+    "@astrojs/node": "^7.0.3",
+    "@astrojs/svelte": "^5.0.3",
+    "astro": "^4.0.8",
     "svelte": "^4.2.5"
   }
 }

examples/ssr/src/api.ts

@@ -32,7 +32,7 @@ async function get<T>(
 	});
 	if (!response.ok) {
 		// TODO make this better...
-		return null;
+		throw new Error('Fetch failed');
 	}
 	return cb(response);
 }

examples/ssr/src/pages/api/cart.ts

@@ -1,8 +1,8 @@
-import { APIContext } from 'astro';
+import type { APIContext } from 'astro';
 import { userCartItems } from '../../models/session';
 
 export function GET({ cookies }: APIContext) {
-	let userId = cookies.get('user-id').value;
+	let userId = cookies.get('user-id')?.value;
 
 	if (!userId || !userCartItems.has(userId)) {
 		return Response.json({ items: [] });
@@ -21,7 +21,7 @@ interface AddToCartItem {
 export async function POST({ cookies, request }: APIContext) {
 	const item: AddToCartItem = await request.json();
 
-	let userId = cookies.get('user-id').value;
+	let userId = cookies.get('user-id')?.value;
 
 	if (!userCartItems.has(userId)) {
 		userCartItems.set(userId, new Map());

examples/ssr/src/pages/login.form.async.ts

@@ -1,4 +1,4 @@
-import { APIContext, APIRoute } from 'astro';
+import type { APIContext, APIRoute } from 'astro';
 
 export const POST: APIRoute = ({ cookies }: APIContext) => {
 	// add a new cookie

examples/ssr/src/pages/login.form.ts

@@ -1,4 +1,4 @@
-import { APIContext } from 'astro';
+import type { APIContext } from 'astro';
 
 export function POST({ cookies }: APIContext) {
 	// add a new cookie

examples/starlog/README.md

@@ -0,0 +1,7 @@
+# Starlog
+
+## Release notes theme for Astro
+
+![starlog-gh](https://github.com/doodlemarks/starlog/assets/2244813/9c5c2e46-665a-437e-a971-053db4dbff63)
+
+Built with Astro and Sass. Supports both dark and light modes.

packages/astro/test/fixtures/custom-404-server/astro.config.mjs → examples/starlog/astro.config.mjs

@@ -1,8 +1,6 @@
 import { defineConfig } from 'astro/config';
-import testAdapter from '../../test-adapter.js';
 
 // https://astro.build/config
 export default defineConfig({
-    output: 'server',
-    adapter: testAdapter(),
+	site: 'https://example.com',
 });

examples/starlog/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@example/starlog",
+  "type": "module",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview",
+    "astro": "astro"
+  },
+  "dependencies": {
+    "astro": "^4.0.5",
+    "sass": "^1.69.5",
+    "sharp": "^0.32.5"
+  }
+}